Эх сурвалжийг харах

Merge branch 'master' of http://kpt.kptyun.cn:3000/Epans/modernDairy

清行 2 жил өмнө
parent
commit
610fc6a637
100 өөрчлөгдсөн 1188 нэмэгдсэн , 1158 устгасан
  1. BIN
      dist-现代牧业-测试地址-20221116.zip
  2. 0 0
      dist/index.html
  3. BIN
      dist20221107测试地址2t.zip
  4. BIN
      dist20221108正式地址1t.zip
  5. BIN
      dist20221108测试地址1.zip
  6. BIN
      dist20221108测试地址2.zip
  7. BIN
      dist20221109正式地址2.zip
  8. BIN
      dist20221109测试地址1.zip
  9. BIN
      dist20221110正式地址2.zip
  10. BIN
      dist20221110测试地址1.zip
  11. BIN
      dist20221110测试地址2.zip
  12. BIN
      dist20221114正式地址1.zip
  13. BIN
      dist20221114测试地址1.zip
  14. BIN
      dist20221115测试地址1.zip
  15. 15 15
      src/views/asset/SST/index.vue
  16. 40 40
      src/views/asset/basics/index.vue
  17. 40 40
      src/views/asset/basics/index1.vue
  18. 40 40
      src/views/asset/basics/index2.vue
  19. 13 13
      src/views/asset/complain/index.vue
  20. 11 11
      src/views/asset/equipmentAllocation/index.vue
  21. 15 15
      src/views/asset/install/index.vue
  22. 13 13
      src/views/asset/installrecord/index.vue
  23. 13 13
      src/views/asset/mailrepair/index.vue
  24. 13 13
      src/views/asset/order/index.vue
  25. 13 13
      src/views/asset/ordersend/index.vue
  26. 13 13
      src/views/asset/service/index.vue
  27. 2 2
      src/views/asset/standardAssetAllocation/index.vue
  28. 13 13
      src/views/asset/telvisit/index.vue
  29. 11 11
      src/views/asset/template/components/baoyang.vue
  30. 14 14
      src/views/asset/template/components/buwei.vue
  31. 14 14
      src/views/asset/template/components/buwei1.vue
  32. 13 13
      src/views/asset/template/components/dianjian.vue
  33. 10 10
      src/views/asset/template/components/guzhang.vue
  34. 12 12
      src/views/asset/template/components/yunxing.vue
  35. 10 10
      src/views/basic/assetStandardManagement/index.vue
  36. 16 16
      src/views/basic/brand/index.vue
  37. 9 9
      src/views/basic/maintenanceWorkerCategory/index.vue
  38. 16 16
      src/views/basic/otherinfo/index - 副本.vue
  39. 16 16
      src/views/basic/otherinfo/index.vue
  40. 13 13
      src/views/basic/product/index.vue
  41. 11 11
      src/views/basic/productclass/index.vue
  42. 11 11
      src/views/basic/standardStock/index.vue
  43. 14 14
      src/views/basic/warehouse/index.vue
  44. 13 13
      src/views/business/visit/index.vue
  45. 11 11
      src/views/console/apisql/index.vue
  46. 11 11
      src/views/console/assetType/index.vue
  47. 11 11
      src/views/console/dept/index.vue
  48. 11 11
      src/views/console/dict/index.vue
  49. 13 13
      src/views/console/emp/index.vue
  50. 15 15
      src/views/console/feedings/index.vue
  51. 11 11
      src/views/console/menu/index.vue
  52. 11 11
      src/views/console/ranchManagement/index.vue
  53. 13 13
      src/views/console/role/index.vue
  54. 6 6
      src/views/console/safetyStock/index.vue
  55. 11 11
      src/views/console/stockType/index.vue
  56. 12 12
      src/views/console/user/index.vue
  57. 12 12
      src/views/console/user/index备份.vue
  58. 12 12
      src/views/console/user/index改好 - 副本.vue
  59. 12 12
      src/views/console/user/index改好.vue
  60. 15 15
      src/views/cost/budget/index.vue
  61. 16 16
      src/views/cost/diesel/index.vue
  62. 17 17
      src/views/cost/elec/index.vue
  63. 17 17
      src/views/cost/gas/index.vue
  64. 15 15
      src/views/cost/generation/index.vue
  65. 15 15
      src/views/cost/methane/index.vue
  66. 7 7
      src/views/cost/other/index.vue
  67. 17 17
      src/views/cost/steam/index.vue
  68. 17 17
      src/views/cost/water/index.vue
  69. 11 11
      src/views/custom/allot/index.vue
  70. 11 11
      src/views/custom/allot/index1.vue
  71. 19 19
      src/views/custom/basic/index.vue
  72. 19 19
      src/views/custom/contract/index.vue
  73. 8 8
      src/views/custom/contractManagement/index.vue
  74. 17 17
      src/views/custom/custom/index.vue
  75. 19 19
      src/views/custom/inventory/index.vue
  76. 5 5
      src/views/custom/outRecord/index.vue
  77. 15 15
      src/views/custom/outStock/index.vue
  78. 15 15
      src/views/custom/outStock/index1.vue
  79. 15 15
      src/views/custom/purchase/index.vue
  80. 48 18
      src/views/custom/receive/index.vue
  81. 6 6
      src/views/custom/record/index.vue
  82. 7 7
      src/views/custom/refuse/index.vue
  83. 11 11
      src/views/custom/retreat/index.vue
  84. 20 20
      src/views/custom/returngoods/index.vue
  85. 2 2
      src/views/custom/saplog/index.vue
  86. 16 16
      src/views/custom/storage/index.vue
  87. 20 20
      src/views/custom/subscribe/index.vue
  88. 8 8
      src/views/custom/writeoff/index.vue
  89. 8 8
      src/views/custom/writeoff/index1.vue
  90. 8 8
      src/views/dashboard/editor/index.vue
  91. 15 15
      src/views/electro/electroData/index.vue
  92. 28 28
      src/views/evaluationVerification/assessment/index.vue
  93. 10 10
      src/views/knowledgeBase/file/index.vue
  94. 4 4
      src/views/maintenance/maintain/index.vue
  95. 4 4
      src/views/maintenance/maintain/index备份.vue
  96. 4 4
      src/views/maintenance/maintain/index改好.vue
  97. 5 5
      src/views/maintenance/maintenancePlan/index.vue
  98. 14 14
      src/views/maintenance/repair/index.vue
  99. 16 16
      src/views/maintenance/spotCheck/index.vue
  100. 15 15
      src/views/maintenance/upkeep/index.vue

BIN
dist20221115正式地址1t.zip → dist-现代牧业-测试地址-20221116.zip


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/index.html


BIN
dist20221107测试地址2t.zip


BIN
dist20221108正式地址1t.zip


BIN
dist20221108测试地址1.zip


BIN
dist20221108测试地址2.zip


BIN
dist20221109正式地址2.zip


BIN
dist20221109测试地址1.zip


BIN
dist20221110正式地址2.zip


BIN
dist20221110测试地址1.zip


BIN
dist20221110测试地址2.zip


BIN
dist20221114正式地址1.zip


BIN
dist20221114测试地址1.zip


BIN
dist20221115测试地址1.zip


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

@@ -18,9 +18,9 @@
       <el-date-picker v-model="getdataListParm.parammaps.enabledTime" type="date" placeholder="开启日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
       <el-date-picker v-model="getdataListParm.parammaps.enabledTime" type="date" placeholder="开启日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
       <el-date-picker v-model="getdataListParm.parammaps.blockTime" type="date" placeholder="关闭日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
       <el-date-picker v-model="getdataListParm.parammaps.blockTime" type="date" placeholder="关闭日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
 
 
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleCreate">启停</el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_add">启停</el-button>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -92,7 +92,7 @@
         <template slot-scope="{row}">
         <template slot-scope="{row}">
           <el-button type="success" size="mini" :disabled="row.changeStatue=='启用'? true : false" @click="handleSST(row)">开启</el-button>
           <el-button type="success" size="mini" :disabled="row.changeStatue=='启用'? true : false" @click="handleSST(row)">开启</el-button>
           <el-button type="danger" size="mini" :disabled="row.changeStatue=='停用'? true : false" @click="handleSST(row)">关闭</el-button>
           <el-button type="danger" size="mini" :disabled="row.changeStatue=='停用'? true : false" @click="handleSST(row)">关闭</el-button>
-          <el-button type="primary" size="mini" @click="handleSee(row)">启停记录</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">启停记录</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -204,7 +204,7 @@
           <h3 style="margin-bottom:50px;">是否{{ tempSST.changeStatue =="停用"?"开启":"关闭" }}?</h3>
           <h3 style="margin-bottom:50px;">是否{{ tempSST.changeStatue =="停用"?"开启":"关闭" }}?</h3>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="tempSST.changeStatue =='停用'?createDataSST1():createDataSST2()">确认</el-button>
+          <el-button type="primary" @click="tempSST.changeStatue =='停用'?add_dialog_saveSST1():add_dialog_saveSST2()">确认</el-button>
           <el-button @click="dialogFormVisibleSST = false">关闭</el-button>
           <el-button @click="dialogFormVisibleSST = false">关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -217,7 +217,7 @@
           <div class="filter-container">
           <div class="filter-container">
             <el-date-picker v-model="getdataListParmSee.parammaps.startTime" type="date" placeholder="开启日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
             <el-date-picker v-model="getdataListParmSee.parammaps.startTime" type="date" placeholder="开启日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
             <el-date-picker v-model="getdataListParmSee.parammaps.stopTime" type="date" placeholder="关闭日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
             <el-date-picker v-model="getdataListParmSee.parammaps.stopTime" type="date" placeholder="关闭日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
-            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilterDelivery">搜索</el-button>
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchDelivery">搜索</el-button>
           </div>
           </div>
         </el-form>
         </el-form>
         <el-table
         <el-table
@@ -599,7 +599,7 @@ export default {
     changeDepart(item) {
     changeDepart(item) {
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -612,7 +612,7 @@ export default {
       row.status = status
       row.status = status
     },
     },
 
 
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         pastureName: '',
         pastureName: '',
         deptName: '',
         deptName: '',
@@ -630,7 +630,7 @@ export default {
         pastureId: parseInt(Cookies.get('pastureid'))
         pastureId: parseInt(Cookies.get('pastureid'))
       }
       }
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -639,8 +639,8 @@ export default {
       })
       })
     },
     },
 
 
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.edit = 1
       this.edit = 1
       this.getDepartParam.parammaps.pastureId = this.temp.pastureId
       this.getDepartParam.parammaps.pastureId = this.temp.pastureId
       this.getCreateDepartDownList()
       this.getCreateDepartDownList()
@@ -660,7 +660,7 @@ export default {
     },
     },
 
 
     // 启用
     // 启用
-    createDataSST1() {
+    add_dialog_saveSST1() {
       console.log(this.tempSST)
       console.log(this.tempSST)
       var sendData = {
       var sendData = {
         name: 'updateEQStartStop',
         name: 'updateEQStartStop',
@@ -693,7 +693,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createDataSST2() {
+    add_dialog_saveSST2() {
       console.log(this.tempSST)
       console.log(this.tempSST)
       var sendData = {
       var sendData = {
         name: 'updateEQStartStop',
         name: 'updateEQStartStop',
@@ -727,7 +727,7 @@ export default {
       })
       })
     },
     },
 
 
-    createDataSST() {
+    add_dialog_saveSST() {
       this.requestParamSST.parammaps.id = this.tempSST.id
       this.requestParamSST.parammaps.id = this.tempSST.id
       this.requestParamSST.parammaps.pastureId = this.tempSST.pastureId
       this.requestParamSST.parammaps.pastureId = this.tempSST.pastureId
       this.requestParamSST.parammaps.sttId = this.tempSST.sttId
       this.requestParamSST.parammaps.sttId = this.tempSST.sttId
@@ -927,14 +927,14 @@ export default {
       })
       })
     },
     },
 
 
-    handleSee(row) {
+    form_see(row) {
       this.rowSeeData = Object.assign({}, row)
       this.rowSeeData = Object.assign({}, row)
       this.cardTitle = '启停记录  设备名称:' + row.eqName + '设备编号:' + row.eqCode
       this.cardTitle = '启停记录  设备名称:' + row.eqName + '设备编号:' + row.eqCode
       this.dialogFormVisibleCard = true
       this.dialogFormVisibleCard = true
       this.getdataListParmSee.parammaps.assetId = row.id
       this.getdataListParmSee.parammaps.assetId = row.id
       this.getListSee()
       this.getListSee()
     },
     },
-    handleFilterDelivery() {
+    form_searchDelivery() {
       if (this.getdataListParmSee.parammaps.inputDatetime === null) {
       if (this.getdataListParmSee.parammaps.inputDatetime === null) {
         this.getdataListParmSee.parammaps.inputDatetime = ''
         this.getdataListParmSee.parammaps.inputDatetime = ''
       }
       }

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

@@ -47,9 +47,9 @@
           <el-input v-model="getdataListParm.parammaps.proName" placeholder="供应商" clearable style="width: 120px;" class="filter-item" />
           <el-input v-model="getdataListParm.parammaps.proName" placeholder="供应商" clearable style="width: 120px;" class="filter-item" />
 
 
                    
                    
-          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isBasicsAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isBasicsAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
 
 
 
 
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
@@ -118,10 +118,10 @@
             <el-table-column label="使用率(%)" sortable align="center" prop="utilizationRate" />
             <el-table-column label="使用率(%)" sortable align="center" prop="utilizationRate" />
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-                <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-                <el-button v-if="isBasicsDel2" style="display:inline-block" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-                <el-button v-else style="display:none" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+                <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+                <el-button v-if="isBasicsDel2" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+                <el-button v-else style="display:none" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
@@ -147,7 +147,7 @@
             <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
           <el-date-picker ref="inputDatetime1" v-model="getdataListParmSH.parammaps.inputDatetime1" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime1" v-model="getdataListParmSH.parammaps.inputDatetime1" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterSH">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchSH">搜索</el-button>
           <div>
           <div>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownloadSH">导出</el-button>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownloadSH">导出</el-button>
           </div>
           </div>
@@ -191,13 +191,13 @@
             </el-table-column>
             </el-table-column>
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-                <el-button v-if="isBasicsUpdate && row.SHStatus == 2" style="display:inline-block" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-                <el-button v-else style="display:none" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+                <el-button v-if="isBasicsUpdate && row.SHStatus == 2" style="display:inline-block" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+                <el-button v-else style="display:none" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
                 <el-button v-if="isBasicExamine && row.SHStatus == 0" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-if="isBasicExamine && row.SHStatus == 0" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
-                <el-button v-if="isBasicsDel && row.SHStatus == 2" style="display:inline-block" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-                <el-button v-else style="display:none" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+                <el-button v-if="isBasicsDel && row.SHStatus == 2" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+                <el-button v-else style="display:none" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
@@ -406,8 +406,8 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
-          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getdataListParm.parammaps.inputDatetime = ''">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getdataListParm.parammaps.inputDatetime = ''">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -420,7 +420,7 @@
           <span>内部编号:{{ seeTemp.eqCode }}</span>
           <span>内部编号:{{ seeTemp.eqCode }}</span>
         </div>
         </div>
         <div class="card">
         <div class="card">
-          <el-tabs v-model="activeName" @tab-click="handleSeeTabClick">
+          <el-tabs v-model="activeName" @tab-click="form_seeTabClick">
             <el-tab-pane label="基础信息" name="first">
             <el-tab-pane label="基础信息" name="first">
               <el-form ref="seeTemp" :rules="rules" :model="seeTemp" label-position="right" label-width="115px" style="width: 100%;margin-bottom:30px">
               <el-form ref="seeTemp" :rules="rules" :model="seeTemp" label-position="right" label-width="115px" style="width: 100%;margin-bottom:30px">
                 <el-row>
                 <el-row>
@@ -604,7 +604,7 @@
             </el-tab-pane>
             </el-tab-pane>
             <el-tab-pane v-if="isDisplayRecord" label="点检记录" name="second">
             <el-tab-pane v-if="isDisplayRecord" label="点检记录" name="second">
               <el-date-picker ref="inputDatetimeCheck1" v-model="getAssetBigSpotCheckListParm.parammaps.inputDatetimeSpotCheck1" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeCheck1" v-model="getAssetBigSpotCheckListParm.parammaps.inputDatetimeSpotCheck1" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterSportCheck">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchSportCheck">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingSpotCheck1"
                 v-loading="listLoadingSpotCheck1"
@@ -635,7 +635,7 @@
                 <el-option v-for="item in maintainTypes" :key="item.id" :label="item.name" :value="item.name" />
                 <el-option v-for="item in maintainTypes" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
               </el-select>
               <el-date-picker ref="inputDatetimeUpkeepbyeq" v-model="getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeUpkeepbyeq" v-model="getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterUpkeepbyeq">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchUpkeepbyeq">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingUpkeepbyeq"
                 v-loading="listLoadingUpkeepbyeq"
@@ -668,7 +668,7 @@
             <el-tab-pane v-if="isDisplayRecord" label="维修记录" name="fouth">
             <el-tab-pane v-if="isDisplayRecord" label="维修记录" name="fouth">
               <el-input v-model="getAssetMaintainParm.parammaps.repairCode" placeholder="维修单号" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetMaintainParm.parammaps.repairCode" placeholder="维修单号" style="width: 140px;" class="filter-item" />
               <el-date-picker ref="inputDatetimeAssetMaintain" v-model="getAssetMaintainParm.parammaps.inputDatetimeAssetMaintain" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeAssetMaintain" v-model="getAssetMaintainParm.parammaps.inputDatetimeAssetMaintain" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterAssetMaintain">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetMaintain">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingAssetMaintain"
                 v-loading="listLoadingAssetMaintain"
@@ -702,7 +702,7 @@
               <div class="filter-container">
               <div class="filter-container">
                 <el-date-picker v-model="getAssetSTTParm.parammaps.startTime" type="date" placeholder="开启日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
                 <el-date-picker v-model="getAssetSTTParm.parammaps.startTime" type="date" placeholder="开启日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
                 <el-date-picker v-model="getAssetSTTParm.parammaps.stopTime" type="date" placeholder="关闭日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
                 <el-date-picker v-model="getAssetSTTParm.parammaps.stopTime" type="date" placeholder="关闭日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
-                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilterAssetSTT">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetSTT">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -735,7 +735,7 @@
                   <el-option v-for="item in changeStates" :key="item.id" :label="item.name" :value="item.id" />
                   <el-option v-for="item in changeStates" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
                 </el-select>
                 <el-date-picker ref="inputDatetimeAssetChange" v-model="getAssetChangeParm.parammaps.inputDatetimeAssetChange" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                 <el-date-picker ref="inputDatetimeAssetChange" v-model="getAssetChangeParm.parammaps.inputDatetimeAssetChange" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterAssetChange">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetChange">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -766,7 +766,7 @@
               <el-input v-model="getAssetPartApplyParm.parammaps.partCode" placeholder="备件编号" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetPartApplyParm.parammaps.partCode" placeholder="备件编号" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetPartApplyParm.parammaps.partName" placeholder="备件名称" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetPartApplyParm.parammaps.partName" placeholder="备件名称" style="width: 140px;" class="filter-item" />
               <el-date-picker ref="inputDatetimeAssetPartApply" v-model="getAssetPartApplyParm.parammaps.inputDatetimeAssetPartApply" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeAssetPartApply" v-model="getAssetPartApplyParm.parammaps.inputDatetimeAssetPartApply" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterAssetPartApply">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetPartApply">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingAssetPartApply"
                 v-loading="listLoadingAssetPartApply"
@@ -818,7 +818,7 @@
                       <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
                       <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
                     </el-select>
                     </el-select>
                     <el-date-picker ref="inputDatetime2" v-model="getChartSeeParm.parammaps.inputDatetime2" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                     <el-date-picker ref="inputDatetime2" v-model="getChartSeeParm.parammaps.inputDatetime2" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterChartSee">搜索</el-button>
+                    <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchChartSee">搜索</el-button>
                     <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownloadChartSee">导出</el-button>
                     <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownloadChartSee">导出</el-button>
                   </div>
                   </div>
                   <el-table
                   <el-table
@@ -1568,7 +1568,7 @@ export default {
         return '历史数据'
         return '历史数据'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.parammaps.pastureId = ''
       this.getdataListParm.parammaps.pastureId = ''
       if (this.getdataListParm.parammaps.warning !== '') {
       if (this.getdataListParm.parammaps.warning !== '') {
@@ -1604,7 +1604,7 @@ export default {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleFilterSH() {
+    form_searchSH() {
       this.listLoadingSH = true
       this.listLoadingSH = true
       if (this.getdataListParmSH.parammaps.inputDatetime1 == null) {
       if (this.getdataListParmSH.parammaps.inputDatetime1 == null) {
         this.getdataListParmSH.parammaps.inputDatetime1 = ''
         this.getdataListParmSH.parammaps.inputDatetime1 = ''
@@ -1684,7 +1684,7 @@ export default {
       }
       }
       this.width = width + 'px'
       this.width = width + 'px'
     },
     },
-    createDataAdd() {
+    add_dialog_saveAdd() {
       console.log('点击了保存')
       console.log('点击了保存')
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
@@ -1786,7 +1786,7 @@ export default {
       this.createTemp.fileList = []
       this.createTemp.fileList = []
       this.createTemp.depreciation = ''
       this.createTemp.depreciation = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.edit = 1
       this.edit = 1
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
@@ -1829,7 +1829,7 @@ export default {
         this.getdataListParm.parammaps.eqClassId = ''
         this.getdataListParm.parammaps.eqClassId = ''
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1892,7 +1892,7 @@ export default {
       })
       })
     },
     },
     // 继续新增
     // 继续新增
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1952,7 +1952,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       if (this.dialogFormVisible) {
       if (this.dialogFormVisible) {
         return
         return
       }
       }
@@ -1997,7 +1997,7 @@ export default {
         this.showUpload = false
         this.showUpload = false
       }
       }
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           console.log('-----------', this.createTemp)
           console.log('-----------', this.createTemp)
@@ -2088,7 +2088,7 @@ export default {
       this.$set(this.createTemp, 'employeName', item.name)
       this.$set(this.createTemp, 'employeName', item.name)
       this.$forceUpdate()
       this.$forceUpdate()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.seeTemp = Object.assign({}, row) // copy obj
       this.seeTemp = Object.assign({}, row) // copy obj
       this.activeName = 'first'
       this.activeName = 'first'
@@ -2108,7 +2108,7 @@ export default {
       }
       }
       // 查看-点检记录
       // 查看-点检记录
     },
     },
-    handleSeeTabClick(val) {
+    form_seeTabClick(val) {
       console.log(val)
       console.log(val)
       if (val.name == 'second') {
       if (val.name == 'second') {
         this.getAssetBigSpotCheckList()
         this.getAssetBigSpotCheckList()
@@ -2158,7 +2158,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterSportCheck() {
+    form_searchSportCheck() {
       if (this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 == null) {
       if (this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 == null) {
         this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 = ''
         this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 = ''
       }
       }
@@ -2192,7 +2192,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterUpkeepbyeq() {
+    form_searchUpkeepbyeq() {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq === null) {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq === null) {
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq = ''
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq = ''
       }
       }
@@ -2228,7 +2228,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetMaintain() {
+    form_searchAssetMaintain() {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan === null) {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan === null) {
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan = ''
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan = ''
       }
       }
@@ -2255,7 +2255,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetSTT() {
+    form_searchAssetSTT() {
       if (this.getAssetSTTParm.parammaps.startTime == null) {
       if (this.getAssetSTTParm.parammaps.startTime == null) {
         this.getAssetSTTParm.parammaps.startTime = ''
         this.getAssetSTTParm.parammaps.startTime = ''
       }
       }
@@ -2293,7 +2293,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetChange() {
+    form_searchAssetChange() {
       if (this.getAssetChangeParm.parammaps.inputDatetimeAssetChange === null) {
       if (this.getAssetChangeParm.parammaps.inputDatetimeAssetChange === null) {
         this.getAssetChangeParm.parammaps.inputDatetimeAssetChange = ''
         this.getAssetChangeParm.parammaps.inputDatetimeAssetChange = ''
       }
       }
@@ -2339,7 +2339,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetPartApply() {
+    form_searchAssetPartApply() {
       this.listLoadingAssetChange = true
       this.listLoadingAssetChange = true
       if (this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange == null) {
       if (this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange == null) {
         this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange = ''
         this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange = ''
@@ -2526,7 +2526,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterChartSee() {
+    form_searchChartSee() {
       this.listLoadingChartSee = true
       this.listLoadingChartSee = true
       if (this.getChartSeeParm.parammaps.inputDatetime2 === null) {
       if (this.getChartSeeParm.parammaps.inputDatetime2 === null) {
         this.getChartSeeParm.parammaps.inputDatetime2 = ''
         this.getChartSeeParm.parammaps.inputDatetime2 = ''
@@ -2571,7 +2571,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除此信息?', {
       MessageBox.confirm('确认删除此信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -41,9 +41,9 @@
           <el-date-picker ref="inputDatetime1" v-model="getdataListParm.parammaps.inputDatetime1" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="审批日期" end-placeholder="审批日期" />
           <el-date-picker ref="inputDatetime1" v-model="getdataListParm.parammaps.inputDatetime1" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="审批日期" end-placeholder="审批日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm.parammaps.inputDatetime2" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="购置日期" end-placeholder="购置日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm.parammaps.inputDatetime2" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="购置日期" end-placeholder="购置日期" />
           <el-date-picker ref="inputDatetime3" v-model="getdataListParm.parammaps.inputDatetime3" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="报废日期" end-placeholder="报废日期" />
           <el-date-picker ref="inputDatetime3" v-model="getdataListParm.parammaps.inputDatetime3" class="inputDatetime" type="daterange" style="width: 250px;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="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isBasicsAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isBasicsAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
             <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleBatchChange">批量变更</el-button>
             <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleBatchChange">批量变更</el-button>
           </div>
           </div>
@@ -106,10 +106,10 @@
             <el-table-column label="使用率(%)" sortable align="center" prop="utilizationRate" />
             <el-table-column label="使用率(%)" sortable align="center" prop="utilizationRate" />
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-                <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-                <el-button v-if="isBasicsDel2" style="display:inline-block" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-                <el-button v-else style="display:none" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+                <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+                <el-button v-if="isBasicsDel2" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+                <el-button v-else style="display:none" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
@@ -135,7 +135,7 @@
             <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
           <el-date-picker ref="inputDatetime1" v-model="getdataListParmSH.parammaps.inputDatetime1" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime1" v-model="getdataListParmSH.parammaps.inputDatetime1" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterSH">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchSH">搜索</el-button>
           <div>
           <div>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownloadSH">导出</el-button>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownloadSH">导出</el-button>
           </div>
           </div>
@@ -179,13 +179,13 @@
             </el-table-column>
             </el-table-column>
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-                <el-button v-if="isBasicsUpdate && row.SHStatus == 2" style="display:inline-block" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-                <el-button v-else style="display:none" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+                <el-button v-if="isBasicsUpdate && row.SHStatus == 2" style="display:inline-block" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+                <el-button v-else style="display:none" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
                 <el-button v-if="isBasicExamine && row.SHStatus == 0" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-if="isBasicExamine && row.SHStatus == 0" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
-                <el-button v-if="isBasicsDel && row.SHStatus == 2" style="display:inline-block" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-                <el-button v-else style="display:none" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+                <el-button v-if="isBasicsDel && row.SHStatus == 2" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+                <el-button v-else style="display:none" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
@@ -394,8 +394,8 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
-          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getdataListParm.parammaps.inputDatetime = ''">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getdataListParm.parammaps.inputDatetime = ''">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -408,7 +408,7 @@
           <span>内部编号:{{ seeTemp.eqCode }}</span>
           <span>内部编号:{{ seeTemp.eqCode }}</span>
         </div>
         </div>
         <div class="card">
         <div class="card">
-          <el-tabs v-model="activeName" @tab-click="handleSeeTabClick">
+          <el-tabs v-model="activeName" @tab-click="form_seeTabClick">
             <el-tab-pane label="基础信息" name="first">
             <el-tab-pane label="基础信息" name="first">
               <el-form ref="seeTemp" :rules="rules" :model="seeTemp" label-position="right" label-width="115px" style="width: 100%;margin-bottom:30px">
               <el-form ref="seeTemp" :rules="rules" :model="seeTemp" label-position="right" label-width="115px" style="width: 100%;margin-bottom:30px">
                 <el-row>
                 <el-row>
@@ -592,7 +592,7 @@
             </el-tab-pane>
             </el-tab-pane>
             <el-tab-pane v-if="isDisplayRecord" label="点检记录" name="second">
             <el-tab-pane v-if="isDisplayRecord" label="点检记录" name="second">
               <el-date-picker ref="inputDatetimeCheck1" v-model="getAssetBigSpotCheckListParm.parammaps.inputDatetimeSpotCheck1" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeCheck1" v-model="getAssetBigSpotCheckListParm.parammaps.inputDatetimeSpotCheck1" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterSportCheck">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchSportCheck">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingSpotCheck1"
                 v-loading="listLoadingSpotCheck1"
@@ -623,7 +623,7 @@
                 <el-option v-for="item in maintainTypes" :key="item.id" :label="item.name" :value="item.name" />
                 <el-option v-for="item in maintainTypes" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
               </el-select>
               <el-date-picker ref="inputDatetimeUpkeepbyeq" v-model="getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeUpkeepbyeq" v-model="getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterUpkeepbyeq">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchUpkeepbyeq">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingUpkeepbyeq"
                 v-loading="listLoadingUpkeepbyeq"
@@ -656,7 +656,7 @@
             <el-tab-pane v-if="isDisplayRecord" label="维修记录" name="fouth">
             <el-tab-pane v-if="isDisplayRecord" label="维修记录" name="fouth">
               <el-input v-model="getAssetMaintainParm.parammaps.repairCode" placeholder="维修单号" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetMaintainParm.parammaps.repairCode" placeholder="维修单号" style="width: 140px;" class="filter-item" />
               <el-date-picker ref="inputDatetimeAssetMaintain" v-model="getAssetMaintainParm.parammaps.inputDatetimeAssetMaintain" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeAssetMaintain" v-model="getAssetMaintainParm.parammaps.inputDatetimeAssetMaintain" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterAssetMaintain">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetMaintain">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingAssetMaintain"
                 v-loading="listLoadingAssetMaintain"
@@ -690,7 +690,7 @@
               <div class="filter-container">
               <div class="filter-container">
                 <el-date-picker v-model="getAssetSTTParm.parammaps.startTime" type="date" placeholder="开启日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
                 <el-date-picker v-model="getAssetSTTParm.parammaps.startTime" type="date" placeholder="开启日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
                 <el-date-picker v-model="getAssetSTTParm.parammaps.stopTime" type="date" placeholder="关闭日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
                 <el-date-picker v-model="getAssetSTTParm.parammaps.stopTime" type="date" placeholder="关闭日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
-                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilterAssetSTT">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetSTT">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -723,7 +723,7 @@
                   <el-option v-for="item in changeStates" :key="item.id" :label="item.name" :value="item.id" />
                   <el-option v-for="item in changeStates" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
                 </el-select>
                 <el-date-picker ref="inputDatetimeAssetChange" v-model="getAssetChangeParm.parammaps.inputDatetimeAssetChange" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                 <el-date-picker ref="inputDatetimeAssetChange" v-model="getAssetChangeParm.parammaps.inputDatetimeAssetChange" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterAssetChange">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetChange">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -754,7 +754,7 @@
               <el-input v-model="getAssetPartApplyParm.parammaps.partCode" placeholder="备件编号" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetPartApplyParm.parammaps.partCode" placeholder="备件编号" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetPartApplyParm.parammaps.partName" placeholder="备件名称" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetPartApplyParm.parammaps.partName" placeholder="备件名称" style="width: 140px;" class="filter-item" />
               <el-date-picker ref="inputDatetimeAssetPartApply" v-model="getAssetPartApplyParm.parammaps.inputDatetimeAssetPartApply" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeAssetPartApply" v-model="getAssetPartApplyParm.parammaps.inputDatetimeAssetPartApply" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterAssetPartApply">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetPartApply">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingAssetPartApply"
                 v-loading="listLoadingAssetPartApply"
@@ -806,7 +806,7 @@
                       <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
                       <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
                     </el-select>
                     </el-select>
                     <el-date-picker ref="inputDatetime2" v-model="getChartSeeParm.parammaps.inputDatetime2" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                     <el-date-picker ref="inputDatetime2" v-model="getChartSeeParm.parammaps.inputDatetime2" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterChartSee">搜索</el-button>
+                    <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchChartSee">搜索</el-button>
                     <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownloadChartSee">导出</el-button>
                     <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownloadChartSee">导出</el-button>
                   </div>
                   </div>
                   <el-table
                   <el-table
@@ -1487,7 +1487,7 @@ export default {
         return '历史数据'
         return '历史数据'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.parammaps.pastureId = ''
       this.getdataListParm.parammaps.pastureId = ''
       if (this.getdataListParm.parammaps.warning !== '') {
       if (this.getdataListParm.parammaps.warning !== '') {
@@ -1523,7 +1523,7 @@ export default {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleFilterSH() {
+    form_searchSH() {
       this.listLoadingSH = true
       this.listLoadingSH = true
       if (this.getdataListParmSH.parammaps.inputDatetime1 == null) {
       if (this.getdataListParmSH.parammaps.inputDatetime1 == null) {
         this.getdataListParmSH.parammaps.inputDatetime1 = ''
         this.getdataListParmSH.parammaps.inputDatetime1 = ''
@@ -1603,7 +1603,7 @@ export default {
       }
       }
       this.width = width + 'px'
       this.width = width + 'px'
     },
     },
-    createDataAdd() {
+    add_dialog_saveAdd() {
       console.log('点击了保存')
       console.log('点击了保存')
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
@@ -1705,7 +1705,7 @@ export default {
       this.createTemp.fileList = []
       this.createTemp.fileList = []
       this.createTemp.depreciation = ''
       this.createTemp.depreciation = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.edit = 1
       this.edit = 1
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
@@ -1748,7 +1748,7 @@ export default {
         this.getdataListParm.parammaps.eqClassId = ''
         this.getdataListParm.parammaps.eqClassId = ''
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1811,7 +1811,7 @@ export default {
       })
       })
     },
     },
     // 继续新增
     // 继续新增
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1871,7 +1871,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       if (this.dialogFormVisible) {
       if (this.dialogFormVisible) {
         return
         return
       }
       }
@@ -1916,7 +1916,7 @@ export default {
         this.showUpload = false
         this.showUpload = false
       }
       }
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           console.log('-----------', this.createTemp)
           console.log('-----------', this.createTemp)
@@ -2007,7 +2007,7 @@ export default {
       this.$set(this.createTemp, 'employeName', item.name)
       this.$set(this.createTemp, 'employeName', item.name)
       this.$forceUpdate()
       this.$forceUpdate()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.seeTemp = Object.assign({}, row) // copy obj
       this.seeTemp = Object.assign({}, row) // copy obj
       this.activeName = 'first'
       this.activeName = 'first'
@@ -2027,7 +2027,7 @@ export default {
       }
       }
       // 查看-点检记录
       // 查看-点检记录
     },
     },
-    handleSeeTabClick(val) {
+    form_seeTabClick(val) {
       console.log(val)
       console.log(val)
       if (val.name == 'second') {
       if (val.name == 'second') {
         this.getAssetBigSpotCheckList()
         this.getAssetBigSpotCheckList()
@@ -2077,7 +2077,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterSportCheck() {
+    form_searchSportCheck() {
       if (this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 == null) {
       if (this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 == null) {
         this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 = ''
         this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 = ''
       }
       }
@@ -2111,7 +2111,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterUpkeepbyeq() {
+    form_searchUpkeepbyeq() {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq === null) {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq === null) {
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq = ''
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq = ''
       }
       }
@@ -2147,7 +2147,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetMaintain() {
+    form_searchAssetMaintain() {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan === null) {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan === null) {
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan = ''
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan = ''
       }
       }
@@ -2174,7 +2174,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetSTT() {
+    form_searchAssetSTT() {
       if (this.getAssetSTTParm.parammaps.startTime == null) {
       if (this.getAssetSTTParm.parammaps.startTime == null) {
         this.getAssetSTTParm.parammaps.startTime = ''
         this.getAssetSTTParm.parammaps.startTime = ''
       }
       }
@@ -2212,7 +2212,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetChange() {
+    form_searchAssetChange() {
       if (this.getAssetChangeParm.parammaps.inputDatetimeAssetChange === null) {
       if (this.getAssetChangeParm.parammaps.inputDatetimeAssetChange === null) {
         this.getAssetChangeParm.parammaps.inputDatetimeAssetChange = ''
         this.getAssetChangeParm.parammaps.inputDatetimeAssetChange = ''
       }
       }
@@ -2258,7 +2258,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetPartApply() {
+    form_searchAssetPartApply() {
       this.listLoadingAssetChange = true
       this.listLoadingAssetChange = true
       if (this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange == null) {
       if (this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange == null) {
         this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange = ''
         this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange = ''
@@ -2445,7 +2445,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterChartSee() {
+    form_searchChartSee() {
       this.listLoadingChartSee = true
       this.listLoadingChartSee = true
       if (this.getChartSeeParm.parammaps.inputDatetime2 === null) {
       if (this.getChartSeeParm.parammaps.inputDatetime2 === null) {
         this.getChartSeeParm.parammaps.inputDatetime2 = ''
         this.getChartSeeParm.parammaps.inputDatetime2 = ''
@@ -2490,7 +2490,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除此信息?', {
       MessageBox.confirm('确认删除此信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -41,9 +41,9 @@
           <el-date-picker ref="inputDatetime1" v-model="getdataListParm.parammaps.inputDatetime1" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="审批日期" end-placeholder="审批日期" />
           <el-date-picker ref="inputDatetime1" v-model="getdataListParm.parammaps.inputDatetime1" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="审批日期" end-placeholder="审批日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm.parammaps.inputDatetime2" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="购置日期" end-placeholder="购置日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm.parammaps.inputDatetime2" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="购置日期" end-placeholder="购置日期" />
           <el-date-picker ref="inputDatetime3" v-model="getdataListParm.parammaps.inputDatetime3" class="inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="报废日期" end-placeholder="报废日期" />
           <el-date-picker ref="inputDatetime3" v-model="getdataListParm.parammaps.inputDatetime3" class="inputDatetime" type="daterange" style="width: 250px;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="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isBasicsAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isBasicsAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
             <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleBatchChange">批量变更</el-button>
             <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleBatchChange">批量变更</el-button>
           </div>
           </div>
@@ -106,10 +106,10 @@
             <el-table-column label="使用率(%)" sortable align="center" prop="utilizationRate" />
             <el-table-column label="使用率(%)" sortable align="center" prop="utilizationRate" />
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-                <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-                <el-button v-if="isBasicsDel2" style="display:inline-block" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-                <el-button v-else style="display:none" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+                <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+                <el-button v-if="isBasicsDel2" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+                <el-button v-else style="display:none" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
@@ -135,7 +135,7 @@
             <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
           <el-date-picker ref="inputDatetime1" v-model="getdataListParmSH.parammaps.inputDatetime1" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime1" v-model="getdataListParmSH.parammaps.inputDatetime1" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterSH">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchSH">搜索</el-button>
           <div>
           <div>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownloadSH">导出</el-button>
             <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownloadSH">导出</el-button>
           </div>
           </div>
@@ -179,13 +179,13 @@
             </el-table-column>
             </el-table-column>
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-                <el-button v-if="isBasicsUpdate && row.SHStatus == 2" style="display:inline-block" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-                <el-button v-else style="display:none" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+                <el-button v-if="isBasicsCard" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+                <el-button v-if="isBasicsUpdate && row.SHStatus == 2" style="display:inline-block" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+                <el-button v-else style="display:none" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
                 <el-button v-if="isBasicExamine && row.SHStatus == 0" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-if="isBasicExamine && row.SHStatus == 0" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
-                <el-button v-if="isBasicsDel && row.SHStatus == 2" style="display:inline-block" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-                <el-button v-else style="display:none" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+                <el-button v-if="isBasicsDel && row.SHStatus == 2" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+                <el-button v-else style="display:none" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
@@ -394,8 +394,8 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
-          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getdataListParm.parammaps.inputDatetime = ''">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getdataListParm.parammaps.inputDatetime = ''">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -408,7 +408,7 @@
           <span>内部编号:{{ seeTemp.eqCode }}</span>
           <span>内部编号:{{ seeTemp.eqCode }}</span>
         </div>
         </div>
         <div class="card">
         <div class="card">
-          <el-tabs v-model="activeName" @tab-click="handleSeeTabClick">
+          <el-tabs v-model="activeName" @tab-click="form_seeTabClick">
             <el-tab-pane label="基础信息" name="first">
             <el-tab-pane label="基础信息" name="first">
               <el-form ref="seeTemp" :rules="rules" :model="seeTemp" label-position="right" label-width="115px" style="width: 100%;margin-bottom:30px">
               <el-form ref="seeTemp" :rules="rules" :model="seeTemp" label-position="right" label-width="115px" style="width: 100%;margin-bottom:30px">
                 <el-row>
                 <el-row>
@@ -592,7 +592,7 @@
             </el-tab-pane>
             </el-tab-pane>
             <el-tab-pane v-if="isDisplayRecord" label="点检记录" name="second">
             <el-tab-pane v-if="isDisplayRecord" label="点检记录" name="second">
               <el-date-picker ref="inputDatetimeCheck1" v-model="getAssetBigSpotCheckListParm.parammaps.inputDatetimeSpotCheck1" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeCheck1" v-model="getAssetBigSpotCheckListParm.parammaps.inputDatetimeSpotCheck1" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterSportCheck">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchSportCheck">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingSpotCheck1"
                 v-loading="listLoadingSpotCheck1"
@@ -623,7 +623,7 @@
                 <el-option v-for="item in maintainTypes" :key="item.id" :label="item.name" :value="item.name" />
                 <el-option v-for="item in maintainTypes" :key="item.id" :label="item.name" :value="item.name" />
               </el-select>
               </el-select>
               <el-date-picker ref="inputDatetimeUpkeepbyeq" v-model="getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeUpkeepbyeq" v-model="getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterUpkeepbyeq">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchUpkeepbyeq">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingUpkeepbyeq"
                 v-loading="listLoadingUpkeepbyeq"
@@ -656,7 +656,7 @@
             <el-tab-pane v-if="isDisplayRecord" label="维修记录" name="fouth">
             <el-tab-pane v-if="isDisplayRecord" label="维修记录" name="fouth">
               <el-input v-model="getAssetMaintainParm.parammaps.repairCode" placeholder="维修单号" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetMaintainParm.parammaps.repairCode" placeholder="维修单号" style="width: 140px;" class="filter-item" />
               <el-date-picker ref="inputDatetimeAssetMaintain" v-model="getAssetMaintainParm.parammaps.inputDatetimeAssetMaintain" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeAssetMaintain" v-model="getAssetMaintainParm.parammaps.inputDatetimeAssetMaintain" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterAssetMaintain">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetMaintain">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingAssetMaintain"
                 v-loading="listLoadingAssetMaintain"
@@ -690,7 +690,7 @@
               <div class="filter-container">
               <div class="filter-container">
                 <el-date-picker v-model="getAssetSTTParm.parammaps.startTime" type="date" placeholder="开启日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
                 <el-date-picker v-model="getAssetSTTParm.parammaps.startTime" type="date" placeholder="开启日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
                 <el-date-picker v-model="getAssetSTTParm.parammaps.stopTime" type="date" placeholder="关闭日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
                 <el-date-picker v-model="getAssetSTTParm.parammaps.stopTime" type="date" placeholder="关闭日期" style="width:170px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
-                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilterAssetSTT">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetSTT">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -723,7 +723,7 @@
                   <el-option v-for="item in changeStates" :key="item.id" :label="item.name" :value="item.id" />
                   <el-option v-for="item in changeStates" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
                 </el-select>
                 <el-date-picker ref="inputDatetimeAssetChange" v-model="getAssetChangeParm.parammaps.inputDatetimeAssetChange" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                 <el-date-picker ref="inputDatetimeAssetChange" v-model="getAssetChangeParm.parammaps.inputDatetimeAssetChange" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterAssetChange">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetChange">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -754,7 +754,7 @@
               <el-input v-model="getAssetPartApplyParm.parammaps.partCode" placeholder="备件编号" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetPartApplyParm.parammaps.partCode" placeholder="备件编号" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetPartApplyParm.parammaps.partName" placeholder="备件名称" style="width: 140px;" class="filter-item" />
               <el-input v-model="getAssetPartApplyParm.parammaps.partName" placeholder="备件名称" style="width: 140px;" class="filter-item" />
               <el-date-picker ref="inputDatetimeAssetPartApply" v-model="getAssetPartApplyParm.parammaps.inputDatetimeAssetPartApply" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
               <el-date-picker ref="inputDatetimeAssetPartApply" v-model="getAssetPartApplyParm.parammaps.inputDatetimeAssetPartApply" class="inputDatetime" type="datetimerange" style="width: 250px;margin-bottom:10px" 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="handleFilterAssetPartApply">搜索</el-button>
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetPartApply">搜索</el-button>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
                 v-loading="listLoadingAssetPartApply"
                 v-loading="listLoadingAssetPartApply"
@@ -806,7 +806,7 @@
                       <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
                       <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
                     </el-select>
                     </el-select>
                     <el-date-picker ref="inputDatetime2" v-model="getChartSeeParm.parammaps.inputDatetime2" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                     <el-date-picker ref="inputDatetime2" v-model="getChartSeeParm.parammaps.inputDatetime2" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterChartSee">搜索</el-button>
+                    <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchChartSee">搜索</el-button>
                     <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownloadChartSee">导出</el-button>
                     <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownloadChartSee">导出</el-button>
                   </div>
                   </div>
                   <el-table
                   <el-table
@@ -1487,7 +1487,7 @@ export default {
         return '历史数据'
         return '历史数据'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.parammaps.pastureId = ''
       this.getdataListParm.parammaps.pastureId = ''
       if (this.getdataListParm.parammaps.warning !== '') {
       if (this.getdataListParm.parammaps.warning !== '') {
@@ -1523,7 +1523,7 @@ export default {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleFilterSH() {
+    form_searchSH() {
       this.listLoadingSH = true
       this.listLoadingSH = true
       if (this.getdataListParmSH.parammaps.inputDatetime1 == null) {
       if (this.getdataListParmSH.parammaps.inputDatetime1 == null) {
         this.getdataListParmSH.parammaps.inputDatetime1 = ''
         this.getdataListParmSH.parammaps.inputDatetime1 = ''
@@ -1603,7 +1603,7 @@ export default {
       }
       }
       this.width = width + 'px'
       this.width = width + 'px'
     },
     },
-    createDataAdd() {
+    add_dialog_saveAdd() {
       console.log('点击了保存')
       console.log('点击了保存')
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
@@ -1705,7 +1705,7 @@ export default {
       this.createTemp.fileList = []
       this.createTemp.fileList = []
       this.createTemp.depreciation = ''
       this.createTemp.depreciation = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.edit = 1
       this.edit = 1
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
@@ -1748,7 +1748,7 @@ export default {
         this.getdataListParm.parammaps.eqClassId = ''
         this.getdataListParm.parammaps.eqClassId = ''
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1811,7 +1811,7 @@ export default {
       })
       })
     },
     },
     // 继续新增
     // 继续新增
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1871,7 +1871,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       if (this.dialogFormVisible) {
       if (this.dialogFormVisible) {
         return
         return
       }
       }
@@ -1916,7 +1916,7 @@ export default {
         this.showUpload = false
         this.showUpload = false
       }
       }
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           console.log('-----------', this.createTemp)
           console.log('-----------', this.createTemp)
@@ -2007,7 +2007,7 @@ export default {
       this.$set(this.createTemp, 'employeName', item.name)
       this.$set(this.createTemp, 'employeName', item.name)
       this.$forceUpdate()
       this.$forceUpdate()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.seeTemp = Object.assign({}, row) // copy obj
       this.seeTemp = Object.assign({}, row) // copy obj
       this.activeName = 'first'
       this.activeName = 'first'
@@ -2027,7 +2027,7 @@ export default {
       }
       }
       // 查看-点检记录
       // 查看-点检记录
     },
     },
-    handleSeeTabClick(val) {
+    form_seeTabClick(val) {
       console.log(val)
       console.log(val)
       if (val.name == 'second') {
       if (val.name == 'second') {
         this.getAssetBigSpotCheckList()
         this.getAssetBigSpotCheckList()
@@ -2077,7 +2077,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterSportCheck() {
+    form_searchSportCheck() {
       if (this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 == null) {
       if (this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 == null) {
         this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 = ''
         this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 = ''
       }
       }
@@ -2111,7 +2111,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterUpkeepbyeq() {
+    form_searchUpkeepbyeq() {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq === null) {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq === null) {
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq = ''
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq = ''
       }
       }
@@ -2147,7 +2147,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetMaintain() {
+    form_searchAssetMaintain() {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan === null) {
       if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan === null) {
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan = ''
         this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan = ''
       }
       }
@@ -2174,7 +2174,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetSTT() {
+    form_searchAssetSTT() {
       if (this.getAssetSTTParm.parammaps.startTime == null) {
       if (this.getAssetSTTParm.parammaps.startTime == null) {
         this.getAssetSTTParm.parammaps.startTime = ''
         this.getAssetSTTParm.parammaps.startTime = ''
       }
       }
@@ -2212,7 +2212,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetChange() {
+    form_searchAssetChange() {
       if (this.getAssetChangeParm.parammaps.inputDatetimeAssetChange === null) {
       if (this.getAssetChangeParm.parammaps.inputDatetimeAssetChange === null) {
         this.getAssetChangeParm.parammaps.inputDatetimeAssetChange = ''
         this.getAssetChangeParm.parammaps.inputDatetimeAssetChange = ''
       }
       }
@@ -2258,7 +2258,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterAssetPartApply() {
+    form_searchAssetPartApply() {
       this.listLoadingAssetChange = true
       this.listLoadingAssetChange = true
       if (this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange == null) {
       if (this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange == null) {
         this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange = ''
         this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange = ''
@@ -2445,7 +2445,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterChartSee() {
+    form_searchChartSee() {
       this.listLoadingChartSee = true
       this.listLoadingChartSee = true
       if (this.getChartSeeParm.parammaps.inputDatetime2 === null) {
       if (this.getChartSeeParm.parammaps.inputDatetime2 === null) {
         this.getChartSeeParm.parammaps.inputDatetime2 = ''
         this.getChartSeeParm.parammaps.inputDatetime2 = ''
@@ -2490,7 +2490,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除此信息?', {
       MessageBox.confirm('确认删除此信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 13 - 13
src/views/asset/complain/index.vue

@@ -32,14 +32,14 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <el-button
       <el-button
         class="filter-item"
         class="filter-item"
         style="margin-left: 10px;"
         style="margin-left: 10px;"
         type="primary"
         type="primary"
         icon="el-icon-edit"
         icon="el-icon-edit"
-        @click="handleCreate"
+        @click="form_add"
       >新增</el-button>
       >新增</el-button>
     </div>
     </div>
 
 
@@ -109,7 +109,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button
           <el-button
             v-if="row.status!='已删'"
             v-if="row.status!='已删'"
             size="mini"
             size="mini"
@@ -217,9 +217,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -316,7 +316,7 @@ export default {
         }, 0.5 * 1000)
         }, 0.5 * 1000)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
@@ -327,7 +327,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         id: undefined,
         id: undefined,
         importance: 1,
         importance: 1,
@@ -338,15 +338,15 @@ export default {
         type: ''
         type: ''
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
@@ -354,7 +354,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -363,7 +363,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           const tempData = Object.assign({}, this.temp)
           const tempData = Object.assign({}, this.temp)
@@ -371,7 +371,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       this.$notify({
       this.$notify({
         title: '成功',
         title: '成功',
         message: '删除成功',
         message: '删除成功',

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

@@ -11,9 +11,9 @@
       <el-input v-model="getdataListParm.parammaps.eqname" placeholder="调拨设备名称" clearable style="width: 180px;" class="filter-item" />
       <el-input v-model="getdataListParm.parammaps.eqname" placeholder="调拨设备名称" clearable style="width: 180px;" class="filter-item" />
       <el-input v-model="getdataListParm.parammaps.assetCode" placeholder="资产编号" clearable style="width: 180px;" class="filter-item" />
       <el-input v-model="getdataListParm.parammaps.assetCode" placeholder="资产编号" clearable style="width: 180px;" class="filter-item" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -68,7 +68,7 @@
       <el-table-column label="调拨日期" sortable prop="transferDate" min-width="80px" align="center" />
       <el-table-column label="调拨日期" sortable prop="transferDate" min-width="80px" align="center" />
       <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -178,7 +178,7 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
-          <el-button v-if="dialogStatus==='create'" type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():createData()">保存并关闭</el-button>
+          <el-button v-if="dialogStatus==='create'" type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():add_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getdataListParm.parammaps.inputDatetime = ''">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getdataListParm.parammaps.inputDatetime = ''">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -339,7 +339,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了搜索')
       console.log('点击了搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime1 === null) {
       if (this.getdataListParm.parammaps.inputDatetime1 === null) {
@@ -365,7 +365,7 @@ export default {
         note: ''
         note: ''
       }
       }
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -497,7 +497,7 @@ export default {
       this.$set(this.createTemp, 'outdept', '')
       this.$set(this.createTemp, 'outdept', '')
       this.$set(this.createTemp, 'eqId', '')
       this.$set(this.createTemp, 'eqId', '')
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -511,16 +511,16 @@ export default {
                 console.log('调拨单号', response.data.list[0].orderCode)
                 console.log('调拨单号', response.data.list[0].orderCode)
                 this.createTemp.DBCode = response.data.list[0].orderCode
                 this.createTemp.DBCode = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       this.postDataPramas.common = { 'returnmap': '0' }
       this.postDataPramas.common = { 'returnmap': '0' }
       this.postDataPramas.data = []
       this.postDataPramas.data = []
       this.postDataPramas.data[0] = { 'name': 'inserteqTransfer', 'type': 'e', 'parammaps': {
       this.postDataPramas.data[0] = { 'name': 'inserteqTransfer', 'type': 'e', 'parammaps': {
@@ -572,7 +572,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleSee(row) {
+    form_see(row) {
       // this.resetCreateTemp()
       // this.resetCreateTemp()
       this.createTemp.eqCode = ''
       this.createTemp.eqCode = ''
       console.log('点击了查看', row)
       console.log('点击了查看', row)

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

@@ -18,9 +18,9 @@
       <el-select v-model="getdataListParm.parammaps.status" clearable placeholder="状态" class="filter-item" style="width: 100px">
       <el-select v-model="getdataListParm.parammaps.status" clearable placeholder="状态" class="filter-item" style="width: 100px">
         <el-option v-for="item in getDictByName" :key="item.id" :label="item.label" :value="item.id" />
         <el-option v-for="item in getDictByName" :key="item.id" :label="item.label" :value="item.id" />
       </el-select>
       </el-select>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleCreate">变更</el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_add">变更</el-button>
         <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
         <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
       </div>
       </div>
     </div>
     </div>
@@ -97,8 +97,8 @@
 
 
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="warning" size="mini" @click="handleUpdate(row)">状态变更</el-button>
-          <el-button type="primary" size="mini" @click="handleSee(row)">变更记录</el-button>
+          <el-button type="warning" size="mini" @click="form_edit(row)">状态变更</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">变更记录</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -202,7 +202,7 @@
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
 
 
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false;getList()">关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -232,7 +232,7 @@
               class="filter-item"
               class="filter-item"
               type="primary"
               type="primary"
               icon="el-icon-search"
               icon="el-icon-search"
-              @click="handleFilterDelivery"
+              @click="form_searchDelivery"
             >搜索</el-button>
             >搜索</el-button>
           </div>
           </div>
         </el-form>
         </el-form>
@@ -574,7 +574,7 @@ export default {
       this.getdataListParm.parammaps.departmentId = ''
       this.getdataListParm.parammaps.departmentId = ''
       this.getDepartDownList()
       this.getDepartDownList()
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -587,7 +587,7 @@ export default {
       // row.status = status
       // row.status = status
       row.statusId = statusId
       row.statusId = statusId
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         pastureName: '',
         pastureName: '',
         deptName: '',
         deptName: '',
@@ -624,7 +624,7 @@ export default {
       // this.temp.departmentId = this.$store.state.user.departmentid
       // this.temp.departmentId = this.$store.state.user.departmentid
     },
     },
 
 
-    createData() {
+    add_dialog_save() {
       if (this.temp.assetId == '' || this.temp.eqCode == '' || this.temp.eqName == '') {
       if (this.temp.assetId == '' || this.temp.eqCode == '' || this.temp.eqName == '') {
         this.$notify({
         this.$notify({
           title: '',
           title: '',
@@ -672,7 +672,7 @@ export default {
       }
       }
     },
     },
 
 
-    updateData() {
+    edit_dialog_save() {
       if (this.checkStatus == this.temp.status) {
       if (this.checkStatus == this.temp.status) {
         this.$notify({
         this.$notify({
           title: '',
           title: '',
@@ -712,7 +712,7 @@ export default {
       }
       }
     },
     },
 
 
-    handleUpdate(row) {
+    form_edit(row) {
       console.log('row', row)
       console.log('row', row)
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.inputDatetime = new Date()
       this.temp.inputDatetime = new Date()
@@ -725,8 +725,8 @@ export default {
       })
       })
     },
     },
 
 
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.temp.empId = this.$store.state.user.employeid
       this.temp.empId = this.$store.state.user.employeid
@@ -735,7 +735,7 @@ export default {
       })
       })
     },
     },
 
 
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.rowSeeData = Object.assign({}, row)
       this.rowSeeData = Object.assign({}, row)
       this.cardTitle = '变更记录  设备名称:' + row.eqName + '设备编号:' + row.eqCode
       this.cardTitle = '变更记录  设备名称:' + row.eqName + '设备编号:' + row.eqCode
@@ -743,7 +743,7 @@ export default {
       this.getdataListParmSee.parammaps.eqId = row.id
       this.getdataListParmSee.parammaps.eqId = row.id
       this.getListSee()
       this.getListSee()
     },
     },
-    handleFilterDelivery() {
+    form_searchDelivery() {
       // this.getdataListParmSee.parammaps.eqId = row.id
       // this.getdataListParmSee.parammaps.eqId = row.id
       if (this.getdataListParmSee.parammaps.inputDatetime === null) {
       if (this.getdataListParmSee.parammaps.inputDatetime === null) {
         this.getdataListParmSee.parammaps.inputDatetime = ''
         this.getdataListParmSee.parammaps.inputDatetime = ''

+ 13 - 13
src/views/asset/installrecord/index.vue

@@ -32,14 +32,14 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <el-button
       <el-button
         class="filter-item"
         class="filter-item"
         style="margin-left: 10px;"
         style="margin-left: 10px;"
         type="primary"
         type="primary"
         icon="el-icon-edit"
         icon="el-icon-edit"
-        @click="handleCreate"
+        @click="form_add"
       >新增</el-button>
       >新增</el-button>
     </div>
     </div>
 
 
@@ -109,7 +109,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button
           <el-button
             v-if="row.status!='已删'"
             v-if="row.status!='已删'"
             size="mini"
             size="mini"
@@ -217,9 +217,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -316,7 +316,7 @@ export default {
         }, 0.5 * 1000)
         }, 0.5 * 1000)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
@@ -327,7 +327,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         id: undefined,
         id: undefined,
         importance: 1,
         importance: 1,
@@ -338,15 +338,15 @@ export default {
         type: ''
         type: ''
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
@@ -354,7 +354,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -363,7 +363,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           const tempData = Object.assign({}, this.temp)
           const tempData = Object.assign({}, this.temp)
@@ -371,7 +371,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       this.$notify({
       this.$notify({
         title: '成功',
         title: '成功',
         message: '删除成功',
         message: '删除成功',

+ 13 - 13
src/views/asset/mailrepair/index.vue

@@ -32,14 +32,14 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <el-button
       <el-button
         class="filter-item"
         class="filter-item"
         style="margin-left: 10px;"
         style="margin-left: 10px;"
         type="primary"
         type="primary"
         icon="el-icon-edit"
         icon="el-icon-edit"
-        @click="handleCreate"
+        @click="form_add"
       >新增</el-button>
       >新增</el-button>
     </div>
     </div>
 
 
@@ -109,7 +109,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button
           <el-button
             v-if="row.status!='已删'"
             v-if="row.status!='已删'"
             size="mini"
             size="mini"
@@ -217,9 +217,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -316,7 +316,7 @@ export default {
         }, 0.5 * 1000)
         }, 0.5 * 1000)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.getList()
       this.getList()
     },
     },
     handleModifyStatus(row, status) {
     handleModifyStatus(row, status) {
@@ -326,7 +326,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         id: undefined,
         id: undefined,
         importance: 1,
         importance: 1,
@@ -337,15 +337,15 @@ export default {
         type: ''
         type: ''
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
@@ -353,7 +353,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -362,7 +362,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           const tempData = Object.assign({}, this.temp)
           const tempData = Object.assign({}, this.temp)
@@ -370,7 +370,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       this.$notify({
       this.$notify({
         title: '成功',
         title: '成功',
         message: '删除成功',
         message: '删除成功',

+ 13 - 13
src/views/asset/order/index.vue

@@ -32,14 +32,14 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <el-button
       <el-button
         class="filter-item"
         class="filter-item"
         style="margin-left: 10px;"
         style="margin-left: 10px;"
         type="primary"
         type="primary"
         icon="el-icon-edit"
         icon="el-icon-edit"
-        @click="handleCreate"
+        @click="form_add"
       >新增</el-button>
       >新增</el-button>
     </div>
     </div>
 
 
@@ -109,7 +109,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button
           <el-button
             v-if="row.status!='已删'"
             v-if="row.status!='已删'"
             size="mini"
             size="mini"
@@ -217,9 +217,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -316,7 +316,7 @@ export default {
         }, 0.5 * 1000)
         }, 0.5 * 1000)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
@@ -327,7 +327,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         id: undefined,
         id: undefined,
         importance: 1,
         importance: 1,
@@ -338,15 +338,15 @@ export default {
         type: ''
         type: ''
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
@@ -354,7 +354,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -363,7 +363,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           const tempData = Object.assign({}, this.temp)
           const tempData = Object.assign({}, this.temp)
@@ -371,7 +371,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       this.$notify({
       this.$notify({
         title: '成功',
         title: '成功',
         message: '删除成功',
         message: '删除成功',

+ 13 - 13
src/views/asset/ordersend/index.vue

@@ -32,14 +32,14 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <el-button
       <el-button
         class="filter-item"
         class="filter-item"
         style="margin-left: 10px;"
         style="margin-left: 10px;"
         type="primary"
         type="primary"
         icon="el-icon-edit"
         icon="el-icon-edit"
-        @click="handleCreate"
+        @click="form_add"
       >新增</el-button>
       >新增</el-button>
     </div>
     </div>
 
 
@@ -109,7 +109,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button
           <el-button
             v-if="row.status!='已删'"
             v-if="row.status!='已删'"
             size="mini"
             size="mini"
@@ -217,9 +217,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -316,7 +316,7 @@ export default {
         }, 0.5 * 1000)
         }, 0.5 * 1000)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -328,7 +328,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         id: undefined,
         id: undefined,
         importance: 1,
         importance: 1,
@@ -339,15 +339,15 @@ export default {
         type: ''
         type: ''
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
@@ -355,7 +355,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -364,7 +364,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           const tempData = Object.assign({}, this.temp)
           const tempData = Object.assign({}, this.temp)
@@ -372,7 +372,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       this.$notify({
       this.$notify({
         title: '成功',
         title: '成功',
         message: '删除成功',
         message: '删除成功',

+ 13 - 13
src/views/asset/service/index.vue

@@ -32,14 +32,14 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <el-button
       <el-button
         class="filter-item"
         class="filter-item"
         style="margin-left: 10px;"
         style="margin-left: 10px;"
         type="primary"
         type="primary"
         icon="el-icon-edit"
         icon="el-icon-edit"
-        @click="handleCreate"
+        @click="form_add"
       >新增</el-button>
       >新增</el-button>
     </div>
     </div>
 
 
@@ -109,7 +109,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button
           <el-button
             v-if="row.status!='已删'"
             v-if="row.status!='已删'"
             size="mini"
             size="mini"
@@ -217,9 +217,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -316,7 +316,7 @@ export default {
         }, 0.5 * 1000)
         }, 0.5 * 1000)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -328,7 +328,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         id: undefined,
         id: undefined,
         importance: 1,
         importance: 1,
@@ -339,15 +339,15 @@ export default {
         type: ''
         type: ''
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
@@ -355,7 +355,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -364,7 +364,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           const tempData = Object.assign({}, this.temp)
           const tempData = Object.assign({}, this.temp)
@@ -372,7 +372,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       this.$notify({
       this.$notify({
         title: '成功',
         title: '成功',
         message: '删除成功',
         message: '删除成功',

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

@@ -42,7 +42,7 @@
         :checked-keys="defaultCheckedKeys"
         :checked-keys="defaultCheckedKeys"
         @popoverHide="popoverHide"
         @popoverHide="popoverHide"
       /> -->
       /> -->
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <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-download" style="float: right;" @click="handleDownload">导出</el-button>
       <el-button class="filter-item" type="success" icon="el-icon-download" style="float: right;" @click="handleDownload">导出</el-button>
 
 
       <el-table
       <el-table
@@ -170,7 +170,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getdataListParm.parammaps.pastureId = this.findAllPasture.find(obj => obj.name == this.getdataListParm.parammaps.pastureName).id
       this.getdataListParm.parammaps.pastureId = this.findAllPasture.find(obj => obj.name == this.getdataListParm.parammaps.pastureName).id

+ 13 - 13
src/views/asset/telvisit/index.vue

@@ -32,14 +32,14 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <el-button
       <el-button
         class="filter-item"
         class="filter-item"
         style="margin-left: 10px;"
         style="margin-left: 10px;"
         type="primary"
         type="primary"
         icon="el-icon-edit"
         icon="el-icon-edit"
-        @click="handleCreate"
+        @click="form_add"
       >新增</el-button>
       >新增</el-button>
     </div>
     </div>
 
 
@@ -109,7 +109,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button
           <el-button
             v-if="row.status!='已删'"
             v-if="row.status!='已删'"
             size="mini"
             size="mini"
@@ -217,9 +217,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -316,7 +316,7 @@ export default {
         }, 0.5 * 1000)
         }, 0.5 * 1000)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
@@ -327,7 +327,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         id: undefined,
         id: undefined,
         importance: 1,
         importance: 1,
@@ -338,15 +338,15 @@ export default {
         type: ''
         type: ''
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
@@ -354,7 +354,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -363,7 +363,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           const tempData = Object.assign({}, this.temp)
           const tempData = Object.assign({}, this.temp)
@@ -371,7 +371,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       this.$notify({
       this.$notify({
         title: '成功',
         title: '成功',
         message: '删除成功',
         message: '删除成功',

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

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="app-container">
   <div class="app-container">
     <div>
     <div>
-      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="handleCreate"> 新增 </el-button>
+      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="form_add"> 新增 </el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-tickets" style="margin:0 10px 10px 0" @click="handleDownloadTemp">模板</el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-tickets" style="margin:0 10px 10px 0" @click="handleDownloadTemp">模板</el-button>
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
@@ -60,8 +60,8 @@
           <el-button type="primary" size="mini" @click="handleMaintenanceContents(row)">保养内容</el-button>
           <el-button type="primary" size="mini" @click="handleMaintenanceContents(row)">保养内容</el-button>
           <el-button type="primary" size="mini" @click="handleSparePart(row)">备件</el-button>
           <el-button type="primary" size="mini" @click="handleSparePart(row)">备件</el-button>
           <el-button type="warning" size="mini" @click="handleCopy(row)">复制</el-button>
           <el-button type="warning" size="mini" @click="handleCopy(row)">复制</el-button>
-          <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -135,8 +135,8 @@
         </el-form>
         </el-form>
       </div>
       </div>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -613,7 +613,7 @@ export default {
       this.createTemp.upkeepLevel = ''
       this.createTemp.upkeepLevel = ''
       this.createTemp.enable = 0
       this.createTemp.enable = 0
     },
     },
-    handleCreate() {
+    form_add() {
       if (this.assetTypeid != '') {
       if (this.assetTypeid != '') {
         this.resetCreateTemp()
         this.resetCreateTemp()
         this.dialogStatus = 'create'
         this.dialogStatus = 'create'
@@ -637,7 +637,7 @@ export default {
         this.isDisplay = false
         this.isDisplay = false
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -665,7 +665,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1042,7 +1042,7 @@ export default {
     //   })
     //   })
     // },
     // },
 
 
-    handleUpdate(row) {
+    form_edit(row) {
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.createTemp = Object.assign({}, row)
       this.createTemp = Object.assign({}, row)
@@ -1050,7 +1050,7 @@ export default {
         this.$refs['createTemp'].clearValidate()
         this.$refs['createTemp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1077,7 +1077,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除?', {
       MessageBox.confirm('确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 14 - 14
src/views/asset/template/components/buwei.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="app-container">
   <div class="app-container">
     <div>
     <div>
-      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="handleCreate">
+      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="form_add">
         新增
         新增
       </el-button>
       </el-button>
       <el-button class="font-small" type="warning" icon="el-icon-copy-document" @click="handleCopy">
       <el-button class="font-small" type="warning" icon="el-icon-copy-document" @click="handleCopy">
@@ -35,10 +35,10 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="300" fixed="right">
       <el-table-column label="操作" align="center" width="300" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-          <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
+          <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button type="success" size="mini" @click="handleSparePart(row)">备件</el-button>
           <el-button type="success" size="mini" @click="handleSparePart(row)">备件</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-button size="mini" type="danger" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -148,12 +148,12 @@
         </el-table>
         </el-table>
       </div>
       </div>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button v-if="dialogStatus==='create'" type="primary" :disabled="isokDisable" @click="createData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button v-if="dialogStatus==='create'" type="primary" :disabled="isokDisable" @click="add_dialog_save()">保存并关闭</el-button>
         <el-button v-if="dialogStatus==='create'" @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button v-if="dialogStatus==='create'" @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button v-if="dialogStatus==='sparePart'" type="primary" :disabled="isokDisable" @click="sparePartData()">保存并关闭</el-button>
         <el-button v-if="dialogStatus==='sparePart'" type="primary" :disabled="isokDisable" @click="sparePartData()">保存并关闭</el-button>
         <el-button v-if="dialogStatus==='sparePart'" @click="dialogFormVisible = false;getList()">关闭</el-button>
         <el-button v-if="dialogStatus==='sparePart'" @click="dialogFormVisible = false;getList()">关闭</el-button>
-        <el-button v-if="dialogStatus==='update'" type="primary" :disabled="isokDisable" @click="updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='update'" type="primary" :disabled="isokDisable" @click="edit_dialog_save()">保存并关闭</el-button>
         <el-button v-if="dialogStatus==='update'" @click="dialogFormVisible = false;getList()">关闭</el-button>
         <el-button v-if="dialogStatus==='update'" @click="dialogFormVisible = false;getList()">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -417,7 +417,7 @@ export default {
       this.listAdd = []
       this.listAdd = []
       this.createTemp = {}
       this.createTemp = {}
     },
     },
-    handleCreate() {
+    form_add() {
       if (this.assetTypeid != '') {
       if (this.assetTypeid != '') {
         this.resetCreateTemp()
         this.resetCreateTemp()
         this.dialogStatus = 'create'
         this.dialogStatus = 'create'
@@ -474,7 +474,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -544,7 +544,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -705,7 +705,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       this.dialogStatusSee = 'see'
       this.dialogStatusSee = 'see'
@@ -726,7 +726,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.createTemp = Object.assign({}, row)
       this.createTemp = Object.assign({}, row)
@@ -737,7 +737,7 @@ export default {
       // this.getdataListParmSee.parammaps.positionId = row.id
       // this.getdataListParmSee.parammaps.positionId = row.id
       // this.getListPart()
       // this.getListPart()
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.postUpdatePramas.name = 'updatePosition'
       this.postUpdatePramas.name = 'updatePosition'
       this.postUpdatePramas.parammaps = {}
       this.postUpdatePramas.parammaps = {}
       this.postUpdatePramas.parammaps.positionName = this.createTemp.positionName
       this.postUpdatePramas.parammaps.positionName = this.createTemp.positionName
@@ -938,7 +938,7 @@ export default {
         return false
         return false
       }
       }
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('名称:' + row.positionName, '确认删除?', {
       MessageBox.confirm('名称:' + row.positionName, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 14 - 14
src/views/asset/template/components/buwei1.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="app-container">
   <div class="app-container">
     <div>
     <div>
-      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="handleCreate">
+      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="form_add">
         新增
         新增
       </el-button>
       </el-button>
       <el-button class="font-small" type="warning" icon="el-icon-copy-document" @click="handleCopy">
       <el-button class="font-small" type="warning" icon="el-icon-copy-document" @click="handleCopy">
@@ -35,10 +35,10 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="300" fixed="right">
       <el-table-column label="操作" align="center" width="300" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-          <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
+          <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button type="success" size="mini" @click="handleSparePart(row)">备件</el-button>
           <el-button type="success" size="mini" @click="handleSparePart(row)">备件</el-button>
-          <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-button size="mini" type="danger" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -148,12 +148,12 @@
         </el-table>
         </el-table>
       </div>
       </div>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button v-if="dialogStatus==='create'" type="primary" :disabled="isokDisable" @click="createData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button v-if="dialogStatus==='create'" type="primary" :disabled="isokDisable" @click="add_dialog_save()">保存并关闭</el-button>
         <el-button v-if="dialogStatus==='create'" @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button v-if="dialogStatus==='create'" @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button v-if="dialogStatus==='sparePart'" type="primary" :disabled="isokDisable" @click="sparePartData()">保存并关闭</el-button>
         <el-button v-if="dialogStatus==='sparePart'" type="primary" :disabled="isokDisable" @click="sparePartData()">保存并关闭</el-button>
         <el-button v-if="dialogStatus==='sparePart'" @click="dialogFormVisible = false;getList()">关闭</el-button>
         <el-button v-if="dialogStatus==='sparePart'" @click="dialogFormVisible = false;getList()">关闭</el-button>
-        <el-button v-if="dialogStatus==='update'" type="primary" :disabled="isokDisable" @click="updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='update'" type="primary" :disabled="isokDisable" @click="edit_dialog_save()">保存并关闭</el-button>
         <el-button v-if="dialogStatus==='update'" @click="dialogFormVisible = false;getList()">关闭</el-button>
         <el-button v-if="dialogStatus==='update'" @click="dialogFormVisible = false;getList()">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -417,7 +417,7 @@ export default {
       this.listAdd = []
       this.listAdd = []
       this.createTemp = {}
       this.createTemp = {}
     },
     },
-    handleCreate() {
+    form_add() {
       if (this.assetTypeid != '') {
       if (this.assetTypeid != '') {
         this.resetCreateTemp()
         this.resetCreateTemp()
         this.dialogStatus = 'create'
         this.dialogStatus = 'create'
@@ -474,7 +474,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -544,7 +544,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -669,7 +669,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       this.dialogStatusSee = 'see'
       this.dialogStatusSee = 'see'
@@ -690,7 +690,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.createTemp = Object.assign({}, row)
       this.createTemp = Object.assign({}, row)
@@ -701,7 +701,7 @@ export default {
       // this.getdataListParmSee.parammaps.positionId = row.id
       // this.getdataListParmSee.parammaps.positionId = row.id
       // this.getListPart()
       // this.getListPart()
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.postUpdatePramas.name = 'updatePosition'
       this.postUpdatePramas.name = 'updatePosition'
       this.postUpdatePramas.parammaps = {}
       this.postUpdatePramas.parammaps = {}
       this.postUpdatePramas.parammaps.positionName = this.createTemp.positionName
       this.postUpdatePramas.parammaps.positionName = this.createTemp.positionName
@@ -902,7 +902,7 @@ export default {
         return false
         return false
       }
       }
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('名称:' + row.positionName, '确认删除?', {
       MessageBox.confirm('名称:' + row.positionName, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 13 - 13
src/views/asset/template/components/dianjian.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="app-container">
   <div class="app-container">
     <div>
     <div>
-      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="handleCreate"> 新增 </el-button>
+      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="form_add"> 新增 </el-button>
       <el-button class="font-small" type="warning" icon="el-icon-copy-document" style="margin:0 10px 10px 0" @click="handleCopy">  复制 </el-button>
       <el-button class="font-small" type="warning" icon="el-icon-copy-document" style="margin:0 10px 10px 0" @click="handleCopy">  复制 </el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-tickets" style="margin:0 10px 10px 0" @click="handleDownloadTemp">模板</el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-tickets" style="margin:0 10px 10px 0" @click="handleDownloadTemp">模板</el-button>
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
@@ -40,9 +40,9 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" header-align="center" align="center" width="260" fixed="right">
       <el-table-column label="操作" header-align="center" align="center" width="260" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-          <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
+          <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -101,8 +101,8 @@
         </el-form>
         </el-form>
       </div>
       </div>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getdataListParm.parammaps.id = assetTypeid;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getdataListParm.parammaps.id = assetTypeid;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -347,7 +347,7 @@ export default {
     resetCreateTemp() {
     resetCreateTemp() {
       this.createTemp = {}
       this.createTemp = {}
     },
     },
-    handleCreate() {
+    form_add() {
       this.getPartList()
       this.getPartList()
       if (this.assetTypeid != '') {
       if (this.assetTypeid != '') {
         this.resetCreateTemp()
         this.resetCreateTemp()
@@ -372,7 +372,7 @@ export default {
         this.createTemp.note = this.listPart.find(obj => obj.id == item).note
         this.createTemp.note = this.listPart.find(obj => obj.id == item).note
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -406,7 +406,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -439,7 +439,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.createTemp = Object.assign({}, row)
       this.createTemp = Object.assign({}, row)
@@ -447,7 +447,7 @@ export default {
         this.$refs['createTemp'].clearValidate()
         this.$refs['createTemp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -548,14 +548,14 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       this.dialogStatusSee = 'see'
       this.dialogStatusSee = 'see'
       this.dialogFormVisibleSee = true
       this.dialogFormVisibleSee = true
     },
     },
 
 
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('名称:' + row.positionName, '确认删除?', {
       MessageBox.confirm('名称:' + row.positionName, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 10 - 10
src/views/asset/template/components/guzhang.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="app-container">
   <div class="app-container">
     <div>
     <div>
-      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="handleCreate"> 新增  </el-button>
+      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="form_add"> 新增  </el-button>
       <el-button class="font-small" type="warning" icon="el-icon-copy-document" style="margin:0 10px 10px 0" @click="handleCopy"> 复制 </el-button>
       <el-button class="font-small" type="warning" icon="el-icon-copy-document" style="margin:0 10px 10px 0" @click="handleCopy"> 复制 </el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-tickets" style="margin:0 10px 10px 0" @click="handleDownloadTemp">模板</el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-tickets" style="margin:0 10px 10px 0" @click="handleDownloadTemp">模板</el-button>
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
@@ -36,9 +36,9 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="260" fixed="right">
       <el-table-column label="操作" align="center" width="260" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <el-button type="danger" size="mini" @click="handleAddFault(row)">添加故障</el-button>
           <el-button type="danger" size="mini" @click="handleAddFault(row)">添加故障</el-button>
-          <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -96,8 +96,8 @@
         </el-form>
         </el-form>
       </div>
       </div>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():addFaultData()">保存并关闭</el-button>
+        <el-button ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():addFaultData()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -399,7 +399,7 @@ export default {
         this.$forceUpdate()
         this.$forceUpdate()
       })
       })
     },
     },
-    handleCreate() {
+    form_add() {
       if (this.assetTypeid != '') {
       if (this.assetTypeid != '') {
         this.resetCreateTemp()
         this.resetCreateTemp()
         this.dialogStatus = 'create'
         this.dialogStatus = 'create'
@@ -434,7 +434,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -468,7 +468,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -569,7 +569,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       this.dialogStatusSee = 'see'
       this.dialogStatusSee = 'see'
@@ -593,7 +593,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       console.log(row)
       console.log(row)
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       this.dialogStatusSee = 'update'
       this.dialogStatusSee = 'update'

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

@@ -8,9 +8,9 @@
         style="margin-left: 10px;float:right;"
         style="margin-left: 10px;float:right;"
         type="primary"
         type="primary"
         icon="el-icon-copy-document"
         icon="el-icon-copy-document"
-        @click="handleCreateCopy"
+        @click="form_addCopy"
       >复制</el-button>
       >复制</el-button>
-      <el-button class="filter-item" style="margin-left: 10px;float:right;" type="primary" icon="el-icon-edit" @click="handleCreate">
+      <el-button class="filter-item" style="margin-left: 10px;float:right;" type="primary" icon="el-icon-edit" @click="form_add">
         新增
         新增
       </el-button>
       </el-button>
     </div>
     </div>
@@ -61,10 +61,10 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">
+          <el-button type="primary" size="mini" @click="form_edit(row)">
             编辑
             编辑
           </el-button>
           </el-button>
-          <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">
+          <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">
             删除
             删除
           </el-button>
           </el-button>
         </template>
         </template>
@@ -127,9 +127,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible_st = false">关闭</el-button>
         <el-button @click="dialogFormVisible_st = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -257,7 +257,7 @@ export default {
       this.startForm.valueType = ''
       this.startForm.valueType = ''
       this.startForm.assetTypeid = ''
       this.startForm.assetTypeid = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible_st = true
       this.dialogFormVisible_st = true
@@ -265,7 +265,7 @@ export default {
         this.getDownList()
         this.getDownList()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['startForm'].validate((valid) => {
       this.$refs['startForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertStartTemplate'
           this.requestParam.name = 'insertStartTemplate'
@@ -286,7 +286,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['startForm'].validate((valid) => {
       this.$refs['startForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertStartTemplate'
           this.requestParam.name = 'insertStartTemplate'
@@ -310,7 +310,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.startForm.id = row.id
       this.startForm.id = row.id
       this.startForm.partId = row.partId
       this.startForm.partId = row.partId
       this.startForm.partName = row.partName
       this.startForm.partName = row.partName
@@ -324,7 +324,7 @@ export default {
         this.getDownList()
         this.getDownList()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['startForm'].validate((valid) => {
       this.$refs['startForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateStartTemplate'
           this.requestParam.name = 'updateStartTemplate'
@@ -372,7 +372,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('名称:' + row.label, '确认删除?', {
       MessageBox.confirm('名称:' + row.label, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 10 - 10
src/views/basic/assetStandardManagement/index.vue

@@ -19,10 +19,10 @@
         style="display: inline-block;top: -3px;"
         style="display: inline-block;top: -3px;"
         @popoverHide="popoverHide"
         @popoverHide="popoverHide"
       />
       />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
     </div>
     </div>
     <div class="operation">
     <div class="operation">
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
     </div>
     </div>
     <el-table
     <el-table
       slot="reference"
       slot="reference"
@@ -76,10 +76,10 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="row.isCreate" :disabled="isokDisable" type="success" size="mini" @click="createData(row)">保存</el-button>
+          <el-button v-if="row.isCreate" :disabled="isokDisable" type="success" size="mini" @click="add_dialog_save(row)">保存</el-button>
           <el-button v-if="row.isCreate" type="danger" size="mini" @click="createCancel(row)">取消</el-button>
           <el-button v-if="row.isCreate" type="danger" size="mini" @click="createCancel(row)">取消</el-button>
-          <el-button v-if="row.isUpdate" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button v-if="row.isUpdateSave" :disabled="isokDisable" type="success" size="mini" @click="updateData(row)">保存</el-button>
+          <el-button v-if="row.isUpdate" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button v-if="row.isUpdateSave" :disabled="isokDisable" type="success" size="mini" @click="edit_dialog_save(row)">保存</el-button>
           <el-button v-if="row.isUpdateSave" type="danger" size="mini" @click="updateCancel(row)">取消</el-button>
           <el-button v-if="row.isUpdateSave" type="danger" size="mini" @click="updateCancel(row)">取消</el-button>
           <el-button v-if="row.isUpdate" type="danger" size="mini" @click="handleRowDelete(row)">删除</el-button>
           <el-button v-if="row.isUpdate" type="danger" size="mini" @click="handleRowDelete(row)">删除</el-button>
         </template>
         </template>
@@ -192,12 +192,12 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.table.listLoading = true
       this.table.listLoading = true
       this.table.getdataListParm.offset = 1
       this.table.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleCreate() {
+    form_add() {
       console.log('新增')
       console.log('新增')
       for (let i = 0; i < this.table.list.length; i++) {
       for (let i = 0; i < this.table.list.length; i++) {
         if (this.table.list[i].Edit === true) {
         if (this.table.list[i].Edit === true) {
@@ -274,7 +274,7 @@ export default {
         this.table.list[0].typeName = ''
         this.table.list[0].typeName = ''
       }
       }
     },
     },
-    createData(row) {
+    add_dialog_save(row) {
       console.log('新增保存', row)
       console.log('新增保存', row)
       console.log(this.table.propertyArray, 'this.table.propertyArray')
       console.log(this.table.propertyArray, 'this.table.propertyArray')
       console.log(this.table.deptNameArray, 'this.table.deptNameArray')
       console.log(this.table.deptNameArray, 'this.table.deptNameArray')
@@ -328,7 +328,7 @@ export default {
         }
         }
       }
       }
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       for (let i = 0; i < this.table.list.length; i++) {
       for (let i = 0; i < this.table.list.length; i++) {
         if (this.table.list[i].Edit == true) {
         if (this.table.list[i].Edit == true) {
           this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
           this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
@@ -343,7 +343,7 @@ export default {
       row.dispaly = 'none'
       row.dispaly = 'none'
       row.isDispaly = false
       row.isDispaly = false
     },
     },
-    updateData(row) {
+    edit_dialog_save(row) {
       this.postDataParm = {}
       this.postDataParm = {}
       this.postDataParm.check = 'update'
       this.postDataParm.check = 'update'
       this.postDataParm.param = {}
       this.postDataParm.param = {}

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

@@ -6,9 +6,9 @@
     </div>
     </div>
     <div class="filter-container">
     <div class="filter-container">
       <el-input v-model="getdataListParm.parammaps.brandName" placeholder="品牌名" style="width: 140px;" class="filter-item" />
       <el-input v-model="getdataListParm.parammaps.brandName" placeholder="品牌名" style="width: 140px;" class="filter-item" />
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
 
 
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload">导出</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload">导出</el-button>
     </div>
     </div>
 
 
@@ -70,9 +70,9 @@
         <template slot-scope="{row}">
         <template slot-scope="{row}">
           <el-button type="success" size="mini" @click="handleeqMenu(row)">设备</el-button>
           <el-button type="success" size="mini" @click="handleeqMenu(row)">设备</el-button>
           <el-button type="success" size="mini" @click="handlePartMenu(row)">备件</el-button>
           <el-button type="success" size="mini" @click="handlePartMenu(row)">备件</el-button>
-          <el-button v-if="isBrandUpdate" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button v-if="isBrandDelete && row.bps === 0 && row.eqs === 0 && row.prs === 0 && row.cts === 0" size="mini" type="danger" @click="handleDelete(row)"> 删除 </el-button>
-          <!-- <el-button type="danger" size="mini" @click="handleDelete(row)">删除</el-button> -->
+          <el-button v-if="isBrandUpdate" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button v-if="isBrandDelete && row.bps === 0 && row.eqs === 0 && row.prs === 0 && row.cts === 0" size="mini" type="danger" @click="form_delete(row)"> 删除 </el-button>
+          <!-- <el-button type="danger" size="mini" @click="form_delete(row)">删除</el-button> -->
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -108,8 +108,8 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" :disabled="isokDisable" type="success" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" :disabled="isokDisable" type="success" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -355,7 +355,7 @@ export default {
         this.findAllPasture = response.data.findAllPasture.list
         this.findAllPasture = response.data.findAllPasture.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -367,14 +367,14 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         // 格式化日期
         // 格式化日期
         inputDatetime: parseTime(new Date(), '{y}-{m}-{d}')
         inputDatetime: parseTime(new Date(), '{y}-{m}-{d}')
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       // this.temp.pastureId = this.$store.state.user.pastureid
       // this.temp.pastureId = this.$store.state.user.pastureid
@@ -382,7 +382,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertBrand'
           this.requestParam.name = 'insertBrand'
@@ -405,7 +405,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -532,7 +532,7 @@ export default {
       })
       })
     },
     },
     // 备件选择结束
     // 备件选择结束
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -540,7 +540,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateBrand'
           this.requestParam.name = 'updateBrand'
@@ -561,7 +561,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('品牌名称:' + row.brandName, '确认禁用?', {
       MessageBox.confirm('品牌名称:' + row.brandName, '确认禁用?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <div class="app-container">
     <div class="app-container">
       <div class="filter-container">
       <div class="filter-container">
-        <el-button v-if="isWorkerAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isWorkerAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       </div>
       </div>
       <el-table
       <el-table
         v-loading="table.listLoading"
         v-loading="table.listLoading"
@@ -33,7 +33,7 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" header-align="center" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button v-if="isWorkerUpdate" type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
+            <el-button v-if="isWorkerUpdate" type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -64,8 +64,8 @@
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="dialogStatus=='create'" type="success" @click="createData_again()">保存并新增</el-button>
-          <el-button type="primary" @click="dialogStatus=='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button v-if="dialogStatus=='create'" type="success" @click="add_dialog_save_again()">保存并新增</el-button>
+          <el-button type="primary" @click="dialogStatus=='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="create.dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="create.dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -140,12 +140,12 @@ export default {
         }, 1000)
         }, 1000)
       })
       })
     },
     },
-    handleCreate() {
+    form_add() {
       this.create.temp = { typeName: '', sort: 0, enable: '1' }
       this.create.temp = { typeName: '', sort: 0, enable: '1' }
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.create.dialogFormVisible = true
       this.create.dialogFormVisible = true
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam = {}
           this.requestParam = {}
@@ -163,7 +163,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam = {}
           this.requestParam = {}
@@ -180,12 +180,12 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.create.temp = Object.assign(row, {})
       this.create.temp = Object.assign(row, {})
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.create.dialogFormVisible = true
       this.create.dialogFormVisible = true
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam = {}
           this.requestParam = {}

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

@@ -7,8 +7,8 @@
       <el-select v-model="getdataListParm.parammaps.departmentName" clearable placeholder="部门" class="filter-item">
       <el-select v-model="getdataListParm.parammaps.departmentName" clearable placeholder="部门" class="filter-item">
         <el-option v-for="item in findAllDepart" :key="item.id" :label="item.name" :value="item.name" />
         <el-option v-for="item in findAllDepart" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       </el-select>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
       </el-upload>
       </el-upload>
@@ -43,7 +43,7 @@
         <template slot-scope="{row}">
         <template slot-scope="{row}">
           <el-button type="success" size="mini" @click="handleChange(row)">换卡</el-button>
           <el-button type="success" size="mini" @click="handleChange(row)">换卡</el-button>
           <el-button type="success" size="mini" @click="handleRecharge(row)">充值</el-button>
           <el-button type="success" size="mini" @click="handleRecharge(row)">充值</el-button>
-          <el-button type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button type="danger" size="mini" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -100,8 +100,8 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" :disabled="isokDisable" type="success" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" :disabled="isokDisable" type="success" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -551,7 +551,7 @@ export default {
         this.getDictByName = response.data.getDictByName.list
         this.getDictByName = response.data.getDictByName.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -561,18 +561,18 @@ export default {
       this.$message({ message: '操作成功', type: 'success' })
       this.$message({ message: '操作成功', type: 'success' })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = { inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), dateFormat: parseTime(new Date(), '{y}-{m}-{d}'), assetName: '', assetId: '', deptName: '', pastureName: '', cardNumber: '', cardType: '', cardAmount: '', rechargeNum: '' }
       this.temp = { inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), dateFormat: parseTime(new Date(), '{y}-{m}-{d}'), assetName: '', assetId: '', deptName: '', pastureName: '', cardNumber: '', cardType: '', cardAmount: '', rechargeNum: '' }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertOilcard'
           this.requestParam.name = 'insertOilcard'
@@ -596,7 +596,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -614,7 +614,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
           PostDataByName(this.requestParam).then(response => {
             console.log(response)
             console.log(response)
             if (response.msg !== 'fail') {
             if (response.msg !== 'fail') {
-              this.resetTemp()
+              this.form_reset()
               this.$nextTick(() => {
               this.$nextTick(() => {
                 this.$refs['temp'].clearValidate()
                 this.$refs['temp'].clearValidate()
               })
               })
@@ -693,7 +693,7 @@ export default {
     createChange() {
     createChange() {
       this.dialogStatus = 'change'
       this.dialogStatus = 'change'
       this.changeFFormVisible = true
       this.changeFFormVisible = true
-      this.resetTemp()
+      this.form_reset()
       this.$set(this.temp, 'employeId', parseFloat(Cookies.get('employeid')))
       this.$set(this.temp, 'employeId', parseFloat(Cookies.get('employeid')))
       this.$set(this.temp, 'cardNumber', '')
       this.$set(this.temp, 'cardNumber', '')
       this.$set(this.temp, 'cardType', '')
       this.$set(this.temp, 'cardType', '')
@@ -734,7 +734,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateOilcard'
           this.requestParam.name = 'updateOilcard'
@@ -769,7 +769,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -777,7 +777,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('油卡编号' + row.cardNumber, '确认删除?', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
       MessageBox.confirm('油卡编号' + row.cardNumber, '确认删除?', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
         this.requestParam.name = 'deleteOilcard'
         this.requestParam.name = 'deleteOilcard'
         this.requestParam.parammaps = {}
         this.requestParam.parammaps = {}

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

@@ -12,8 +12,8 @@
           <div class="name" style="display: inline;">{{ item.cardNumber }}</div>
           <div class="name" style="display: inline;">{{ item.cardNumber }}</div>
         </template>
         </template>
       </el-autocomplete>
       </el-autocomplete>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       <el-button class="filter-item"  style="margin-left: 10px;display: inline-block;" type="info" icon="el-icon-tickets" @click="handleDownloadTemp"> 模板 </el-button>
       <el-button class="filter-item"  style="margin-left: 10px;display: inline-block;" type="info" icon="el-icon-tickets" @click="handleDownloadTemp"> 模板 </el-button>
       <el-button v-if="isOtherinfoExport" class="filter-item" type="success"  style="margin-left: 10px;" icon="el-icon-download" @click="handleDownload">导出</el-button>
       <el-button v-if="isOtherinfoExport" class="filter-item" type="success"  style="margin-left: 10px;" icon="el-icon-download" @click="handleDownload">导出</el-button>
       <el-upload :headers="headers" style="margin-left: 10px;display: inline-block;" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload :headers="headers" style="margin-left: 10px;display: inline-block;" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
@@ -54,12 +54,12 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="350" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="350" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="row.enable == 0" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button v-if="row.enable == 0" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button type="success" size="mini" @click="handleChange(row)">变更记录</el-button>
           <el-button type="success" size="mini" @click="handleChange(row)">变更记录</el-button>
           <el-button type="success" size="mini" @click="handleRecharge(row)">充值</el-button>
           <el-button type="success" size="mini" @click="handleRecharge(row)">充值</el-button>
           <el-button v-if="row.enable == 0" type="danger" size="mini" @click="handleDisable(row)">停用</el-button>
           <el-button v-if="row.enable == 0" type="danger" size="mini" @click="handleDisable(row)">停用</el-button>
           <el-button v-else type="danger" size="mini" @click="handleDisable(row)">启用</el-button>
           <el-button v-else type="danger" size="mini" @click="handleDisable(row)">启用</el-button>
-          <el-button v-if="row.enable == 1" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button v-if="row.enable == 1" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -116,8 +116,8 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" :disabled="isokDisable" type="success" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" :disabled="isokDisable" type="success" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -473,7 +473,7 @@ export default {
         this.findAllDepart = response.data.list
         this.findAllDepart = response.data.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -483,18 +483,18 @@ export default {
       this.$message({ message: '操作成功', type: 'success' })
       this.$message({ message: '操作成功', type: 'success' })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = { inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), dateFormat: parseTime(new Date(), '{y}-{m}-{d}'), assetName: '', assetId: '', deptName: '', pastureName: '', pastureId: Cookies.get('pastureid'), cardNumber: '', cardType: '', cardAmount: '', rechargeNum: '' }
       this.temp = { inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), dateFormat: parseTime(new Date(), '{y}-{m}-{d}'), assetName: '', assetId: '', deptName: '', pastureName: '', pastureId: Cookies.get('pastureid'), cardNumber: '', cardType: '', cardAmount: '', rechargeNum: '' }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           // 卡余额
           // 卡余额
@@ -555,7 +555,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           // 卡余额
           // 卡余额
@@ -608,7 +608,7 @@ export default {
             if (response.msg === 'fail') {
             if (response.msg === 'fail') {
               this.$notify({ title: '失败', message: '保存失败-' + response.data, type: 'danger', duration: 2000 })
               this.$notify({ title: '失败', message: '保存失败-' + response.data, type: 'danger', duration: 2000 })
             } else {
             } else {
-              this.resetTemp()
+              this.form_reset()
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
             }
             }
           })
           })
@@ -730,7 +730,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -741,7 +741,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           // 卡余额
           // 卡余额
@@ -841,7 +841,7 @@ export default {
         this.$message({ type: 'info', message: '已取消停用' })
         this.$message({ type: 'info', message: '已取消停用' })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('油卡编号' + row.cardNumber, '确认删除?', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
       MessageBox.confirm('油卡编号' + row.cardNumber, '确认删除?', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
         this.requestParam = {}
         this.requestParam = {}
         this.requestParam.name = 'checkDeleteOilcard'
         this.requestParam.name = 'checkDeleteOilcard'

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

@@ -7,8 +7,8 @@
     <div class="filter-container">
     <div class="filter-container">
       <!-- 搜索条件 -->
       <!-- 搜索条件 -->
       <el-input v-model="getdataListParm.parammaps.providerName" placeholder="供应商名" style="width: 140px;" class="filter-item" />
       <el-input v-model="getdataListParm.parammaps.providerName" placeholder="供应商名" style="width: 140px;" class="filter-item" />
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
-      <el-button v-if="isProductAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+      <el-button v-if="isProductAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload">导出</el-button>
       <el-button class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload">导出</el-button>
     </div>
     </div>
 
 
@@ -91,8 +91,8 @@
           <el-button type="success" size="mini" @click="handleeqMenu(row)">设备</el-button>
           <el-button type="success" size="mini" @click="handleeqMenu(row)">设备</el-button>
           <el-button type="success" size="mini" @click="handlePartMenu(row)">备件</el-button>
           <el-button type="success" size="mini" @click="handlePartMenu(row)">备件</el-button>
           <el-button type="success" size="mini" @click="handlewarehouseMenu(row)">库位</el-button>
           <el-button type="success" size="mini" @click="handlewarehouseMenu(row)">库位</el-button>
-          <el-button v-if="isProductUpdate" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button v-if="isProductDelete && row.bcs === 0 && row.eqs === 0 && row.pps === 0 && row.eps === 0" size="mini" type="danger" @click="handleDelete(row)">删除 </el-button>
+          <el-button v-if="isProductUpdate" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button v-if="isProductDelete && row.bcs === 0 && row.eqs === 0 && row.pps === 0 && row.eps === 0" size="mini" type="danger" @click="form_delete(row)">删除 </el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -173,7 +173,7 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
           <el-button @click="dialogFormVisible = false">关闭</el-button>
           <el-button @click="dialogFormVisible = false">关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -597,7 +597,7 @@ export default {
       //  this.getDictByName = response.data.getDictByName.list
       //  this.getDictByName = response.data.getDictByName.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -609,14 +609,14 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         // 格式化日期
         // 格式化日期
         inputDatetime: parseTime(new Date(), '{y}-{m}-{d}')
         inputDatetime: parseTime(new Date(), '{y}-{m}-{d}')
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       // this.temp.pastureId = this.$store.state.user.pastureid
       // this.temp.pastureId = this.$store.state.user.pastureid
@@ -624,7 +624,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertProvider'
           this.requestParam.name = 'insertProvider'
@@ -979,7 +979,7 @@ export default {
     //   })
     //   })
     // },
     // },
     // 备件选择结束
     // 备件选择结束
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -987,7 +987,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateProvider'
           this.requestParam.name = 'updateProvider'
@@ -1061,7 +1061,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('设备名称:' + row.providerName, '确认删除?', {
       MessageBox.confirm('设备名称:' + row.providerName, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 11 - 11
src/views/basic/productclass/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <div class="app-container">
     <div class="app-container">
       <div class="filter-container">
       <div class="filter-container">
-        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
+        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">
           新增
           新增
         </el-button>
         </el-button>
       </div>
       </div>
@@ -38,10 +38,10 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button type="primary" size="mini" @click="handleUpdate(row)">
+            <el-button type="primary" size="mini" @click="form_edit(row)">
               编辑
               编辑
             </el-button>
             </el-button>
-            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">
+            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">
               删除
               删除
             </el-button>
             </el-button>
           </template>
           </template>
@@ -75,11 +75,11 @@
             v-if="dialogStatus==='create'"
             v-if="dialogStatus==='create'"
             ref="createb"
             ref="createb"
             type="success"
             type="success"
-            @click="createData_again()"
+            @click="add_dialog_save_again()"
           >
           >
             确认新增
             确认新增
           </el-button>
           </el-button>
-          <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
+          <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">
             确认
             确认
           </el-button>
           </el-button>
           <el-button @click="dialogFormVisible = false">
           <el-button @click="dialogFormVisible = false">
@@ -160,7 +160,7 @@ export default {
       this.dataform.sort = '0'
       this.dataform.sort = '0'
       this.dataform.enable = '1'
       this.dataform.enable = '1'
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -169,7 +169,7 @@ export default {
         this.$refs.productclass.focus()
         this.$refs.productclass.focus()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertPasture'
           this.requestParam.name = 'insertPasture'
@@ -190,7 +190,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertPasture'
           this.requestParam.name = 'insertPasture'
@@ -214,7 +214,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.dataform.id = row.id
       this.dataform.id = row.id
       this.dataform.pastureNumber = row.pastureNumber
       this.dataform.pastureNumber = row.pastureNumber
       this.dataform.name = row.name
       this.dataform.name = row.name
@@ -226,7 +226,7 @@ export default {
         this.$refs['productclass'].focus()
         this.$refs['productclass'].focus()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateProductclass'
           this.requestParam.name = 'updateProductclass'
@@ -265,7 +265,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('分类名称:' + row.productclass, '确认删除?', {
       MessageBox.confirm('分类名称:' + row.productclass, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 11 - 11
src/views/basic/standardStock/index.vue

@@ -20,15 +20,15 @@
         style="display: inline-block;top: -3px;"
         style="display: inline-block;top: -3px;"
         @popoverHide="popoverHide"
         @popoverHide="popoverHide"
       />
       />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <el-button class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp">模板</el-button>
       <el-button class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp">模板</el-button>
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
-        <el-button class="filter-item" type="warning" icon="el-icon-download" @click="handleFilter">导入</el-button>
+        <el-button class="filter-item" type="warning" icon="el-icon-download" @click="form_search">导入</el-button>
       </el-upload>
       </el-upload>
       <el-button class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
       <el-button class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
     </div>
     </div>
     <div class="operation">
     <div class="operation">
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
     </div>
     </div>
     <el-table
     <el-table
       slot="reference"
       slot="reference"
@@ -68,10 +68,10 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="row.isCreate" :disabled="isokDisable" type="success" size="mini" @click="createData(row)">保存</el-button>
+          <el-button v-if="row.isCreate" :disabled="isokDisable" type="success" size="mini" @click="add_dialog_save(row)">保存</el-button>
           <el-button v-if="row.isCreate" type="danger" size="mini" @click="createCancel(row)">取消</el-button>
           <el-button v-if="row.isCreate" type="danger" size="mini" @click="createCancel(row)">取消</el-button>
-          <el-button v-if="row.isUpdate" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button v-if="row.isUpdateSave" :disabled="isokDisable" type="success" size="mini" @click="updateData(row)">保存</el-button>
+          <el-button v-if="row.isUpdate" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button v-if="row.isUpdateSave" :disabled="isokDisable" type="success" size="mini" @click="edit_dialog_save(row)">保存</el-button>
           <el-button v-if="row.isUpdateSave" type="danger" size="mini" @click="updateCancel(row)">取消</el-button>
           <el-button v-if="row.isUpdateSave" type="danger" size="mini" @click="updateCancel(row)">取消</el-button>
           <el-button v-if="row.isUpdate" type="danger" size="mini" @click="handleRowDelete(row)">删除</el-button>
           <el-button v-if="row.isUpdate" type="danger" size="mini" @click="handleRowDelete(row)">删除</el-button>
         </template>
         </template>
@@ -194,12 +194,12 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.table.listLoading = true
       this.table.listLoading = true
       this.table.getdataListParm.offset = 1
       this.table.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleCreate() {
+    form_add() {
       console.log('新增')
       console.log('新增')
       for (let i = 0; i < this.table.list.length; i++) {
       for (let i = 0; i < this.table.list.length; i++) {
         if (this.table.list[i].Edit === true) {
         if (this.table.list[i].Edit === true) {
@@ -253,7 +253,7 @@ export default {
         }
         }
       }
       }
     },
     },
-    createData(row) {
+    add_dialog_save(row) {
       console.log('新增保存', row)
       console.log('新增保存', row)
       console.log(this.table.tablelist, 'this.table.tablelist')
       console.log(this.table.tablelist, 'this.table.tablelist')
       if (this.createTemp.partClassId == '') {
       if (this.createTemp.partClassId == '') {
@@ -306,7 +306,7 @@ export default {
         }
         }
       }
       }
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       for (let i = 0; i < this.table.list.length; i++) {
       for (let i = 0; i < this.table.list.length; i++) {
         if (this.table.list[i].Edit == true) {
         if (this.table.list[i].Edit == true) {
           this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
           this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
@@ -321,7 +321,7 @@ export default {
       this.equipmentCategory.defaultCheckedKeys = [row.partClassId]
       this.equipmentCategory.defaultCheckedKeys = [row.partClassId]
       this.createTemp = row
       this.createTemp = row
     },
     },
-    updateData(row) {
+    edit_dialog_save(row) {
       var arr = []
       var arr = []
       for (let i = 0; i < this.table.tablelist.length; i++) {
       for (let i = 0; i < this.table.tablelist.length; i++) {
         if (row[this.table.tablelist[i].property] !== '' && row[this.table.tablelist[i].property] !== 0 && row[this.table.tablelist[i].property] !== '0') {
         if (row[this.table.tablelist[i].property] !== '' && row[this.table.tablelist[i].property] !== 0 && row[this.table.tablelist[i].property] !== '0') {

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

@@ -18,9 +18,9 @@
           class="filter-item"
           class="filter-item"
           type="primary"
           type="primary"
           icon="el-icon-search"
           icon="el-icon-search"
-          @click="handleFilter"
+          @click="form_search"
         >搜索</el-button>
         >搜索</el-button>
-        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
+        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">
           新增
           新增
         </el-button>
         </el-button>
         <el-upload
         <el-upload
@@ -38,7 +38,7 @@
             class="filter-item"
             class="filter-item"
             type="warning"
             type="warning"
             icon="el-icon-upload2"
             icon="el-icon-upload2"
-            @click="handleFilter"
+            @click="form_search"
           >导入</el-button>
           >导入</el-button>
         </el-upload>
         </el-upload>
         <el-button
         <el-button
@@ -125,8 +125,8 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button type="primary" size="mini" @click="handleUpdate(row)"> 编辑 </el-button>
-            <el-button v-if="row.childrens === 0 && row.cps === 0 && row.prs === 0 && row.pts === 0 && row.pls === 0" size="mini" type="danger" @click="handleDelete(row)"> 删除 </el-button>
+            <el-button type="primary" size="mini" @click="form_edit(row)"> 编辑 </el-button>
+            <el-button v-if="row.childrens === 0 && row.cps === 0 && row.prs === 0 && row.pts === 0 && row.pls === 0" size="mini" type="danger" @click="form_delete(row)"> 删除 </el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -162,8 +162,8 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="dialogStatus==='create'" :disabled="isokDisable" type="success" @click="createData_again()"> 保存并新增 </el-button>
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()"> 保存并关闭 </el-button>
+          <el-button v-if="dialogStatus==='create'" :disabled="isokDisable" type="success" @click="add_dialog_save_again()"> 保存并新增 </el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()"> 保存并关闭 </el-button>
           <el-button @click="dialogFormVisible = false;getList();"> 取消并关闭 </el-button>
           <el-button @click="dialogFormVisible = false;getList();"> 取消并关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -327,7 +327,7 @@ export default {
         }, 0.5 * 1000)
         }, 0.5 * 1000)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getDeptListParm.offset = 1
       this.getDeptListParm.offset = 1
       this.getList()
       this.getList()
@@ -363,7 +363,7 @@ export default {
       this.deptform.sort = '0'
       this.deptform.sort = '0'
       this.deptform.enable = '1'
       this.deptform.enable = '1'
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.defaultCheckedKeys = []
       this.defaultCheckedKeys = []
@@ -395,7 +395,7 @@ export default {
       })
       })
     },
     },
 
 
-    createData() { // 新建数据
+    add_dialog_save() { // 新建数据
       this.isokDisable = true // 禁用按钮
       this.isokDisable = true // 禁用按钮
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false // 延时1秒后启用按钮
         this.isokDisable = false // 延时1秒后启用按钮
@@ -422,7 +422,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -448,7 +448,7 @@ export default {
       })
       })
     },
     },
     // 更新
     // 更新
-    handleUpdate(row) {
+    form_edit(row) {
       this.defaultCheckedKeys = [row.pid]
       this.defaultCheckedKeys = [row.pid]
       this.deptform.id = row.id
       this.deptform.id = row.id
       this.deptform.warehosetName = row.warehosetName
       this.deptform.warehosetName = row.warehosetName
@@ -472,7 +472,7 @@ export default {
       })
       })
     },
     },
     // 提交更新
     // 提交更新
-    updateData() {
+    edit_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -624,7 +624,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('是否删除当前库位信息?', {
       MessageBox.confirm('是否删除当前库位信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 13 - 13
src/views/business/visit/index.vue

@@ -19,10 +19,10 @@
       <el-input v-model="getdataListParm.parammaps.companygroup" placeholder="集团" clearable class="filter-item" style="width: 130px" />
       <el-input v-model="getdataListParm.parammaps.companygroup" placeholder="集团" clearable class="filter-item" style="width: 130px" />
       <el-input v-model="getdataListParm.parammaps.customname" placeholder="客户名称" clearable style="width: 90px" class="filter-item" />
       <el-input v-model="getdataListParm.parammaps.customname" placeholder="客户名称" clearable style="width: 90px" class="filter-item" />
       <el-input v-model="getdataListParm.parammaps.visiter" placeholder="拜访人" clearable style="width: 90px" class="filter-item" />
       <el-input v-model="getdataListParm.parammaps.visiter" placeholder="拜访人" clearable style="width: 90px" class="filter-item" />
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">
         搜索
         搜索
       </el-button>
       </el-button>
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">
         新增
         新增
       </el-button>
       </el-button>
     </div>
     </div>
@@ -73,7 +73,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">
+          <el-button type="primary" size="mini" @click="form_edit(row)">
             编辑
             编辑
           </el-button>
           </el-button>
           <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleModifyStatus(row,'已删')">
           <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleModifyStatus(row,'已删')">
@@ -106,7 +106,7 @@
         <el-button @click="dialogFormVisible = false">
         <el-button @click="dialogFormVisible = false">
           取消
           取消
         </el-button>
         </el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">
           确认
           确认
         </el-button>
         </el-button>
       </div>
       </div>
@@ -215,7 +215,7 @@ export default {
         }, 0.5 * 1000)
         }, 0.5 * 1000)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
@@ -238,9 +238,9 @@ export default {
       } else {
       } else {
         this.listQuery.sort = '-id'
         this.listQuery.sort = '-id'
       }
       }
-      this.handleFilter()
+      this.form_search()
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         id: undefined,
         id: undefined,
         importance: 1,
         importance: 1,
@@ -251,15 +251,15 @@ export default {
         type: ''
         type: ''
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
           this.temp.id = parseInt(Math.random() * 100) + 1024 // mock a id
@@ -277,7 +277,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -286,7 +286,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           const tempData = Object.assign({}, this.temp)
           const tempData = Object.assign({}, this.temp)
@@ -310,7 +310,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       this.$notify({
       this.$notify({
         title: '成功',
         title: '成功',
         message: '删除成功',
         message: '删除成功',

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

@@ -25,7 +25,7 @@
     <el-col :span="19">
     <el-col :span="19">
       <div class="app-container">
       <div class="app-container">
         <div class="filter-container">
         <div class="filter-container">
-          <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
+          <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">
             新增
             新增
           </el-button>
           </el-button>
           <el-input
           <el-input
@@ -99,10 +99,10 @@
           </el-table-column>
           </el-table-column>
           <el-table-column label="操作" header-align="center" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" header-align="center" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button type="primary" size="mini" @click="handleUpdate(row)">
+              <el-button type="primary" size="mini" @click="form_edit(row)">
                 编辑
                 编辑
               </el-button>
               </el-button>
-              <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">
+              <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">
                 删除
                 删除
               </el-button>
               </el-button>
               <el-button type="warning" size="mini" @click="handleCopy(row)">
               <el-button type="warning" size="mini" @click="handleCopy(row)">
@@ -201,11 +201,11 @@
               v-if="dialogStatus==='create'"
               v-if="dialogStatus==='create'"
               ref="createb"
               ref="createb"
               type="success"
               type="success"
-              @click="createData_again()"
+              @click="add_dialog_save_again()"
             >
             >
               确认新增
               确认新增
             </el-button>
             </el-button>
-            <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
+            <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">
               确认
               确认
             </el-button>
             </el-button>
             <el-button @click="dialogFormVisible = false">
             <el-button @click="dialogFormVisible = false">
@@ -423,7 +423,7 @@ export default {
       this.deptform.return_body = ''
       this.deptform.return_body = ''
       this.deptform.name = ''
       this.deptform.name = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.deptform.menuid = this.menuid
       this.deptform.menuid = this.menuid
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
@@ -433,7 +433,7 @@ export default {
         this.$refs.sqlname.focus()
         this.$refs.sqlname.focus()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'createapisql'
           this.requestParam.name = 'createapisql'
@@ -464,7 +464,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'createapisql'
           this.requestParam.name = 'createapisql'
@@ -498,7 +498,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.deptform.sqlid = row.id
       this.deptform.sqlid = row.id
       if (row.menuid === null) { this.deptform.menuid = 0 } else { this.deptform.menuid = row.menuid }
       if (row.menuid === null) { this.deptform.menuid = 0 } else { this.deptform.menuid = row.menuid }
       this.deptform.method = row.method
       this.deptform.method = row.method
@@ -523,7 +523,7 @@ export default {
         this.$refs['sqlname'].focus()
         this.$refs['sqlname'].focus()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateapisql'
           this.requestParam.name = 'updateapisql'
@@ -597,7 +597,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('sql名称:' + row.sqlname, '确认删除?', {
       MessageBox.confirm('sql名称:' + row.sqlname, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -6,7 +6,7 @@
     </div>
     </div>
     <div class="app-container">
     <div class="app-container">
       <div class="filter-container">
       <div class="filter-container">
-        <el-button v-if="isAssetTypeAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增 </el-button>
+        <el-button v-if="isAssetTypeAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增 </el-button>
         <el-button :disabled="isokDisable" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload">导出</el-button>
         <el-button :disabled="isokDisable" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload">导出</el-button>
       </div>
       </div>
       <el-table
       <el-table
@@ -56,8 +56,8 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" header-align="center" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button v-if="isAssetTypeUpdate" type="primary" size="mini" @click="handleUpdate(row)"> 编辑 </el-button>
-            <el-button v-if="row.childrens === 0 && row.bes === 0 && row.eps === 0 && row.eqts === 0 && row.es === 0" size="mini" type="danger" @click="handleDelete(row)">删除 </el-button>
+            <el-button v-if="isAssetTypeUpdate" type="primary" size="mini" @click="form_edit(row)"> 编辑 </el-button>
+            <el-button v-if="row.childrens === 0 && row.bes === 0 && row.eps === 0 && row.eqts === 0 && row.es === 0" size="mini" type="danger" @click="form_delete(row)">删除 </el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -97,8 +97,8 @@
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="textMap[dialogStatus]==='新增'" ref="createb" :disabled="isokDisable" type="success" @click="createData_again()"> 保存并新增 </el-button>
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭 </el-button>
+          <el-button v-if="textMap[dialogStatus]==='新增'" ref="createb" :disabled="isokDisable" type="success" @click="add_dialog_save_again()"> 保存并新增 </el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭 </el-button>
           <el-button @click="dialogFormVisible = false;getList();"> 取消并关闭 </el-button>
           <el-button @click="dialogFormVisible = false;getList();"> 取消并关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -239,7 +239,7 @@ export default {
       this.deptform.temptypeCode = ''
       this.deptform.temptypeCode = ''
       this.deptform.tempPtypeCode = ''
       this.deptform.tempPtypeCode = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.defaultCheckedKeys = []
       this.defaultCheckedKeys = []
@@ -275,7 +275,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -304,7 +304,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -337,7 +337,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -361,7 +361,7 @@ export default {
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateAssetTypeD'
           this.requestParam.name = 'updateAssetTypeD'
@@ -498,7 +498,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('设备类别名称:' + row.typeName + '(' + row.typeCode + ')', '确认删除?', {
       MessageBox.confirm('设备类别名称:' + row.typeName + '(' + row.typeCode + ')', '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

+ 11 - 11
src/views/console/dept/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <div class="app-container">
     <div class="app-container">
       <div class="filter-container">
       <div class="filter-container">
-        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate"> 新增 </el-button>
+        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add"> 新增 </el-button>
       </div>
       </div>
       <el-table
       <el-table
         v-loading="listLoading"
         v-loading="listLoading"
@@ -56,8 +56,8 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button type="primary" size="mini" @click="handleUpdate(row)"> 编辑 </el-button>
-            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)"> 删除 </el-button>
+            <el-button type="primary" size="mini" @click="form_edit(row)"> 编辑 </el-button>
+            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)"> 删除 </el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -127,8 +127,8 @@
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" @click="createData_again()"> 确认新增 </el-button>
-          <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()"> 确认 </el-button>
+          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" @click="add_dialog_save_again()"> 确认新增 </el-button>
+          <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisible = false;getList()"> 关闭 </el-button>
           <el-button @click="dialogFormVisible = false;getList()"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -258,7 +258,7 @@ export default {
       this.deptform.enable = '1'
       this.deptform.enable = '1'
       this.deptform.isPasture = '0'
       this.deptform.isPasture = '0'
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.parentDeptVisible = true
       this.parentDeptVisible = true
@@ -275,7 +275,7 @@ export default {
         this.$refs.deptname.focus()
         this.$refs.deptname.focus()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'createdept'
           this.requestParam.name = 'createdept'
@@ -306,7 +306,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'createdept'
           this.requestParam.name = 'createdept'
@@ -346,7 +346,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.defaultCheckedKeys = [row.parentid]
       this.defaultCheckedKeys = [row.parentid]
 
 
       this.parentDeptVisible = row.parentid > 0
       this.parentDeptVisible = row.parentid > 0
@@ -366,7 +366,7 @@ export default {
         this.$refs['deptname'].focus()
         this.$refs['deptname'].focus()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updatedept'
           this.requestParam.name = 'updatedept'
@@ -418,7 +418,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('部门名称:' + row.deptname, '确认删除?', {
       MessageBox.confirm('部门名称:' + row.deptname, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -26,7 +26,7 @@
     <el-col :span="19">
     <el-col :span="19">
       <div class="app-container">
       <div class="app-container">
         <div class="filter-container">
         <div class="filter-container">
-          <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
+          <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">
             新增
             新增
           </el-button>
           </el-button>
         </div>
         </div>
@@ -84,10 +84,10 @@
           </el-table-column>
           </el-table-column>
           <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button type="primary" size="mini" @click="handleUpdate(row)">
+              <el-button type="primary" size="mini" @click="form_edit(row)">
                 编辑
                 编辑
               </el-button>
               </el-button>
-              <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">
+              <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">
                 删除
                 删除
               </el-button>
               </el-button>
             </template>
             </template>
@@ -145,11 +145,11 @@
               v-if="dialogStatus==='create'"
               v-if="dialogStatus==='create'"
               ref="createb"
               ref="createb"
               type="success"
               type="success"
-              @click="createData_again()"
+              @click="add_dialog_save_again()"
             >
             >
               确认新增
               确认新增
             </el-button>
             </el-button>
-            <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
+            <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">
               确认
               确认
             </el-button>
             </el-button>
             <el-button @click="dialogFormVisible = false">
             <el-button @click="dialogFormVisible = false">
@@ -273,7 +273,7 @@ export default {
       this.deptform.orderby = '0'
       this.deptform.orderby = '0'
       this.deptform.enable = '1'
       this.deptform.enable = '1'
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.deptform.orderby = '0'
       this.deptform.orderby = '0'
@@ -284,7 +284,7 @@ export default {
         this.$refs['label'].focus()
         this.$refs['label'].focus()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertDictList'
           this.requestParam.name = 'insertDictList'
@@ -307,7 +307,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertDictList'
           this.requestParam.name = 'insertDictList'
@@ -335,7 +335,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.deptform.id = row.id
       this.deptform.id = row.id
       this.deptform.label = row.label
       this.deptform.label = row.label
       this.deptform.value = row.value
       this.deptform.value = row.value
@@ -349,7 +349,7 @@ export default {
         this.$refs['label'].focus()
         this.$refs['label'].focus()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateDictList'
           this.requestParam.name = 'updateDictList'
@@ -393,7 +393,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('名称:' + row.label, '确认删除?', {
       MessageBox.confirm('名称:' + row.label, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -18,8 +18,8 @@
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="工号" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="工号" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
 
 
-        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
-        <el-button v-if="isEmpAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+        <el-button v-if="isEmpAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
         <el-button class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
            
            
       </div>
       </div>
@@ -86,8 +86,8 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button v-if="isEmpUpdate" type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
-            <el-button v-if="row.status!='已删' && isEmpDel" size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+            <el-button v-if="isEmpUpdate" type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
+            <el-button v-if="row.status!='已删' && isEmpDel" size="mini" type="danger" @click="form_delete(row)">删除</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -158,8 +158,8 @@
           </el-form-item> -->
           </el-form-item> -->
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" @click="createData_again()">确认新增</el-button>
-          <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="dialogStatus==='create'" ref="createb" type="success" @click="add_dialog_save_again()">确认新增</el-button>
+          <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
           <el-button @click="dialogFormVisible = false;getList()">关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">关闭</el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -345,7 +345,7 @@ export default {
       })
       })
     },
     },
 
 
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -371,7 +371,7 @@ export default {
       this.dataform.enable = '1'
       this.dataform.enable = '1'
       this.defaultCheckedKeys = []
       this.defaultCheckedKeys = []
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -379,7 +379,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       console.log(this.dataform)
       console.log(this.dataform)
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
@@ -418,7 +418,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           if (this.dataform.deptid == '') {
           if (this.dataform.deptid == '') {
@@ -456,7 +456,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       console.log(row)
       console.log(row)
       this.dataform = Object.assign(row, {})
       this.dataform = Object.assign(row, {})
       this.defaultCheckedKeys = [this.dataform.deptid]
       this.defaultCheckedKeys = [this.dataform.deptid]
@@ -466,7 +466,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateEmp'
           this.requestParam.name = 'updateEmp'
@@ -526,7 +526,7 @@ export default {
         json2excel(elecExcelDatas, '员工信息', true, 'xlsx')
         json2excel(elecExcelDatas, '员工信息', true, 'xlsx')
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('名称:' + row.empname, '确认删除?', {
       MessageBox.confirm('名称:' + row.empname, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -8,10 +8,10 @@
       <el-select v-model="getdataListParm.parammaps.pastureName" placeholder="牧场" style="width: 140px;" class="filter-item">
       <el-select v-model="getdataListParm.parammaps.pastureName" placeholder="牧场" style="width: 140px;" class="filter-item">
         <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
         <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       </el-select>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
     </div>
     </div>
     <div class="app-btn" style="height:50px">
     <div class="app-btn" style="height:50px">
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
@@ -65,9 +65,9 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-          <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
+          <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button type="danger" size="mini" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -111,8 +111,8 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" @click="createData_again()">保存并新增</el-button>
-        <el-button v-if="dialogStatus==='create' || dialogStatus==='update'" type="primary" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button v-if="dialogStatus==='create' || dialogStatus==='update'" type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -273,7 +273,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -285,7 +285,7 @@ export default {
       this.createTemp.saleNum = ''
       this.createTemp.saleNum = ''
       this.createTemp.cowNumM = ''
       this.createTemp.cowNumM = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -293,7 +293,7 @@ export default {
         this.$refs['createTemp'].clearValidate()
         this.$refs['createTemp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertFeedsum'
           this.requestParam.name = 'insertFeedsum'
@@ -326,7 +326,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertFeedsum'
           this.requestParam.name = 'insertFeedsum'
@@ -360,7 +360,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.createTemp = Object.assign({}, row) // copy obj
       this.createTemp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -368,7 +368,7 @@ export default {
         this.$refs['createTemp'].clearValidate()
         this.$refs['createTemp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateFeedsum'
           this.requestParam.name = 'updateFeedsum'
@@ -401,7 +401,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.createTemp = Object.assign({}, row)
       this.createTemp = Object.assign({}, row)
       this.dialogStatus = 'see'
       this.dialogStatus = 'see'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -527,7 +527,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('是否删除此条信息?', {
       MessageBox.confirm('是否删除此条信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <div class="app-container">
     <div class="app-container">
       <div class="filter-container">
       <div class="filter-container">
-        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
+        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">
           新增
           新增
         </el-button>
         </el-button>
       </div>
       </div>
@@ -72,10 +72,10 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="260" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button type="primary" size="mini" @click="handleUpdate(row)">
+            <el-button type="primary" size="mini" @click="form_edit(row)">
               编辑
               编辑
             </el-button>
             </el-button>
-            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">
+            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">
               删除
               删除
             </el-button>
             </el-button>
           </template>
           </template>
@@ -164,11 +164,11 @@
             v-if="dialogStatus==='create'"
             v-if="dialogStatus==='create'"
             ref="createb"
             ref="createb"
             type="success"
             type="success"
-            @click="createData_again()"
+            @click="add_dialog_save_again()"
           >
           >
             确认新增
             确认新增
           </el-button>
           </el-button>
-          <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
+          <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">
             确认
             确认
           </el-button>
           </el-button>
           <el-button @click="dialogFormVisible = false">
           <el-button @click="dialogFormVisible = false">
@@ -321,7 +321,7 @@ export default {
       this.deptform.menutype = ''
       this.deptform.menutype = ''
       this.deptform.enable = '1'
       this.deptform.enable = '1'
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.parent = this.parentmenu
       this.parent = this.parentmenu
@@ -331,7 +331,7 @@ export default {
         this.$refs.name.focus()
         this.$refs.name.focus()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'createMenu'
           this.requestParam.name = 'createMenu'
@@ -360,7 +360,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'createMenu'
           this.requestParam.name = 'createMenu'
@@ -396,7 +396,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.defaultCheckedKeys = [row.parentid]
       this.defaultCheckedKeys = [row.parentid]
       this.deptform.parentid = row.parentid
       this.deptform.parentid = row.parentid
       this.deptform.name = row.name
       this.deptform.name = row.name
@@ -417,7 +417,7 @@ export default {
         this.$refs['name'].focus()
         this.$refs['name'].focus()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateMenu'
           this.requestParam.name = 'updateMenu'
@@ -470,7 +470,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('菜单名称:' + row.name, '确认删除?', {
       MessageBox.confirm('菜单名称:' + row.name, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -4,10 +4,10 @@
       <el-select v-model="table.getdataListParm.parammaps.pastureName" placeholder="牧场" style="width: 140px;" class="filter-item">
       <el-select v-model="table.getdataListParm.parammaps.pastureName" placeholder="牧场" style="width: 140px;" class="filter-item">
         <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
         <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       </el-select>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
     </div>
     </div>
     <div class="app-operation" style="height:50px">
     <div class="app-operation" style="height:50px">
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
     </div>
     </div>
     <div class="table">
     <div class="table">
       <el-table
       <el-table
@@ -39,8 +39,8 @@
         <el-table-column label="顺序" min-width="150px" align="center" prop="sort" />
         <el-table-column label="顺序" min-width="150px" align="center" prop="sort" />
         <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-            <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+            <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
+            <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -123,7 +123,7 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="create.dialogStatus !== 'see'" :disabled="isokDisable" type="primary" @click="create.dialogStatus =='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button v-if="create.dialogStatus !== 'see'" :disabled="isokDisable" type="primary" @click="create.dialogStatus =='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="create.dialogFormVisible = false;getList()">关闭</el-button>
           <el-button @click="create.dialogFormVisible = false;getList()">关闭</el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -210,7 +210,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.table.getdataListParm.offset = 1
       this.table.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
@@ -224,7 +224,7 @@ export default {
       this.create.temp.sort = ''
       this.create.temp.sort = ''
       this.create.temp.center = ''
       this.create.temp.center = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.create.dialogStatus = 'create'
       this.create.dialogStatus = 'create'
       this.create.dialogFormVisible = true
       this.create.dialogFormVisible = true
@@ -232,7 +232,7 @@ export default {
         this.$refs['createTemp'].clearValidate()
         this.$refs['createTemp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.isokDisable = true
           this.isokDisable = true
@@ -268,13 +268,13 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       console.log(row)
       console.log(row)
       this.create.temp = Object.assign({}, row)
       this.create.temp = Object.assign({}, row)
       this.create.dialogStatus = 'update'
       this.create.dialogStatus = 'update'
       this.create.dialogFormVisible = true
       this.create.dialogFormVisible = true
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.isokDisable = true
           this.isokDisable = true
@@ -313,7 +313,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.create.dialogStatus = 'see'
       this.create.dialogStatus = 'see'
       this.create.dialogFormVisible = true
       this.create.dialogFormVisible = true
       this.create.temp = Object.assign({}, row)
       this.create.temp = Object.assign({}, row)

+ 13 - 13
src/views/console/role/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <div class="app-container">
     <div class="app-container">
       <div class="filter-container">
       <div class="filter-container">
-        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate"> 新增 </el-button>
+        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add"> 新增 </el-button>
       </div>
       </div>
       <el-table
       <el-table
         v-loading="listLoading"
         v-loading="listLoading"
@@ -39,8 +39,8 @@
           <template slot-scope="{row}">
           <template slot-scope="{row}">
             <el-button type="warning" size="mini" @click="handleMenu(row)">菜单</el-button>
             <el-button type="warning" size="mini" @click="handleMenu(row)">菜单</el-button>
             <el-button type="warning" size="mini" style="width:70px" @click="handleDataRole(row)">数据权限</el-button>
             <el-button type="warning" size="mini" style="width:70px" @click="handleDataRole(row)">数据权限</el-button>
-            <el-button type="primary" size="mini" @click="handleUpdate(row)">编辑</el-button>
-            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+            <el-button type="primary" size="mini" @click="form_edit(row)">编辑</el-button>
+            <el-button v-if="row.status!='已删'" size="mini" type="danger" @click="form_delete(row)">删除</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -62,8 +62,8 @@
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="dialogStatus==='create'" type="success" @click="createData_again()"> 确认新增 </el-button>
-          <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()"> 确认 </el-button>
+          <el-button v-if="dialogStatus==='create'" type="success" @click="add_dialog_save_again()"> 确认新增 </el-button>
+          <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisible = false;getList();"> 关闭 </el-button>
           <el-button @click="dialogFormVisible = false;getList();"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -85,7 +85,7 @@
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="updateDataRole()"> 确认 </el-button>
+          <el-button type="primary" @click="edit_dialog_saveRole()"> 确认 </el-button>
           <el-button @click="dialogDataRoleVisible = false;getList()"> 关闭 </el-button>
           <el-button @click="dialogDataRoleVisible = false;getList()"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -232,7 +232,7 @@ export default {
       this.dataform.enable = 1
       this.dataform.enable = 1
       this.dataform.easInformationReception = 0
       this.dataform.easInformationReception = 0
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -241,7 +241,7 @@ export default {
         this.$refs.name.focus()
         this.$refs.name.focus()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'createRole'
           this.requestParam.name = 'createRole'
@@ -263,7 +263,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'createRole'
           this.requestParam.name = 'createRole'
@@ -325,7 +325,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       console.log(row, '=====')
       console.log(row, '=====')
       this.dataform.id = row.id
       this.dataform.id = row.id
       this.dataform.name = row.name
       this.dataform.name = row.name
@@ -339,7 +339,7 @@ export default {
         this.$refs.name.focus()
         this.$refs.name.focus()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateRole'
           this.requestParam.name = 'updateRole'
@@ -379,7 +379,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('名称:' + row.name, '确认删除?', {
       MessageBox.confirm('名称:' + row.name, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',
@@ -428,7 +428,7 @@ export default {
       })
       })
     },
     },
 
 
-    updateDataRole() {
+    edit_dialog_saveRole() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false

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

@@ -27,10 +27,10 @@
         @popoverHide="popoverHide"
         @popoverHide="popoverHide"
       />
       />
       <el-autocomplete v-model="getdataListParm.parammaps.providerName" clearable value-key="providerName" class="inline-input" :fetch-suggestions="providerSearch" placeholder="供应商" style="width:150px;top:-3px;" @select="handleSelectProvider" />
       <el-autocomplete v-model="getdataListParm.parammaps.providerName" clearable value-key="providerName" class="inline-input" :fetch-suggestions="providerSearch" placeholder="供应商" style="width:150px;top:-3px;" @select="handleSelectProvider" />
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
     </div>
     </div>
     <div class="app-btn" style="height:50px">
     <div class="app-btn" style="height:50px">
-      <el-button class="filter-item" type="primary" @click="handleCreate">库存预警设置</el-button>
+      <el-button class="filter-item" type="primary" @click="form_add">库存预警设置</el-button>
       <!-- <el-button v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
       <!-- <el-button v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
@@ -133,7 +133,7 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():createData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():add_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -335,7 +335,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -348,7 +348,7 @@ export default {
       this.createTemp.maxRepertory = ''
       this.createTemp.maxRepertory = ''
       this.createTemp.minRepertory = ''
       this.createTemp.minRepertory = ''
     },
     },
-    handleCreate() {
+    form_add() {
       if (this.selectionList.length > 0) {
       if (this.selectionList.length > 0) {
         this.resetCreateTemp()
         this.resetCreateTemp()
         this.dialogStatus = 'create'
         this.dialogStatus = 'create'
@@ -361,7 +361,7 @@ export default {
         })
         })
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.postDataPramas.common = { 'returnmap': '0' }
           this.postDataPramas.common = { 'returnmap': '0' }

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

@@ -6,7 +6,7 @@
     </div>
     </div>
     <div class="app-container">
     <div class="app-container">
       <div class="filter-container">
       <div class="filter-container">
-        <el-button v-if="isStockTypeAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
+        <el-button v-if="isStockTypeAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">
           新增
           新增
         </el-button>
         </el-button>
         <el-button
         <el-button
@@ -72,8 +72,8 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" header-align="center" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button v-if="isStockTypeUpdate" type="primary" size="mini" @click="handleUpdate(row)"> 编辑 </el-button>
-            <el-button v-if="row.childrens === 0 && row.pps === 0 && row.bps === 0 && row.ps === 0" size="mini" type="danger" @click="handleDelete(row)"> 删除 </el-button>
+            <el-button v-if="isStockTypeUpdate" type="primary" size="mini" @click="form_edit(row)"> 编辑 </el-button>
+            <el-button v-if="row.childrens === 0 && row.pps === 0 && row.bps === 0 && row.ps === 0" size="mini" type="danger" @click="form_delete(row)"> 删除 </el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -110,8 +110,8 @@
           </el-form-item>
           </el-form-item>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="textMap[dialogStatus]==='新增'" ref="createb" :disabled="isokDisable" type="success" @click="createData_again()"> 保存并新增 </el-button>
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()"> 保存并关闭 </el-button>
+          <el-button v-if="textMap[dialogStatus]==='新增'" ref="createb" :disabled="isokDisable" type="success" @click="add_dialog_save_again()"> 保存并新增 </el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()"> 保存并关闭 </el-button>
           <el-button @click="dialogFormVisible = false;getList();"> 取消并关闭 </el-button>
           <el-button @click="dialogFormVisible = false;getList();"> 取消并关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -246,7 +246,7 @@ export default {
       this.deptform.sort = '0'
       this.deptform.sort = '0'
       this.deptform.enable = 1
       this.deptform.enable = 1
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.defaultCheckedKeys = []
       this.defaultCheckedKeys = []
@@ -278,7 +278,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -311,7 +311,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -348,7 +348,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -368,7 +368,7 @@ export default {
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate((valid) => {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateCategoryType'
           this.requestParam.name = 'updateCategoryType'
@@ -469,7 +469,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('备件类别名称:' + row.partClassName + '(' + row.partClassCode + ')', '确认删除?', {
       MessageBox.confirm('备件类别名称:' + row.partClassName + '(' + row.partClassCode + ')', '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -4,8 +4,8 @@
       <div class="filter-container">
       <div class="filter-container">
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="用户名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="用户名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
-        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
-        <el-button v-if="isUserAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate"> 新增 </el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+        <el-button v-if="isUserAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add"> 新增 </el-button>
       </div>
       </div>
       <el-table
       <el-table
         v-loading="listLoading"
         v-loading="listLoading"
@@ -56,9 +56,9 @@
         <el-table-column label="操作" header-align="center" align="center" width="330" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="330" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
             <el-button v-if="isUserRole" type="warning" size="mini" @click="handleRole(row)"> 角色 </el-button>
             <el-button v-if="isUserRole" type="warning" size="mini" @click="handleRole(row)"> 角色 </el-button>
-            <el-button v-if="isUserEdit" type="primary" size="mini" @click="handleUpdate(row)"> 编辑 </el-button>
+            <el-button v-if="isUserEdit" type="primary" size="mini" @click="form_edit(row)"> 编辑 </el-button>
             <el-button v-if="isUserResetpassword" type="warning" size="mini" style="padding: 7px 5px;" @click="handleResetPassword(row)"> 重置密码 </el-button>
             <el-button v-if="isUserResetpassword" type="warning" size="mini" style="padding: 7px 5px;" @click="handleResetPassword(row)"> 重置密码 </el-button>
-            <el-button v-if="row.status !== '已删' && isUserDelete" size="mini" type="danger" @click="handleDelete(row)"> 删除 </el-button>
+            <el-button v-if="row.status !== '已删' && isUserDelete" size="mini" type="danger" @click="form_delete(row)"> 删除 </el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -109,7 +109,7 @@
 
 
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="updateData()"> 确认 </el-button>
+          <el-button type="primary" @click="edit_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisible = false"> 关闭 </el-button>
           <el-button @click="dialogFormVisible = false"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -161,7 +161,7 @@
 
 
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="createData()"> 确认 </el-button>
+          <el-button type="primary" @click="add_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisibleAdd = false"> 关闭 </el-button>
           <el-button @click="dialogFormVisibleAdd = false"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -304,7 +304,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -312,7 +312,7 @@ export default {
     resetRequestParam() {
     resetRequestParam() {
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisibleAdd = true
       this.dialogFormVisibleAdd = true
@@ -325,7 +325,7 @@ export default {
         this.dataform.maintenanceTypeId = []
         this.dataform.maintenanceTypeId = []
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       var role_Array = []
       var role_Array = []
       for (let i = 0; i < this.dataform.selectedRole.length; i++) {
       for (let i = 0; i < this.dataform.selectedRole.length; i++) {
         var role_obj = {}
         var role_obj = {}
@@ -505,7 +505,7 @@ export default {
         this.getList()
         this.getList()
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       console.log(row)
       console.log(row)
       if (row.maintenancePerson == 1) {
       if (row.maintenancePerson == 1) {
         this.updateParam.params[0] = row.id
         this.updateParam.params[0] = row.id
@@ -531,7 +531,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam = {}
           this.requestParam = {}
@@ -656,7 +656,7 @@ export default {
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除?', {
       MessageBox.confirm('确认删除?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
       }).then(() => {
       }).then(() => {

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

@@ -4,8 +4,8 @@
       <div class="filter-container">
       <div class="filter-container">
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="用户名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="用户名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
-        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
-        <el-button v-if="isUserAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate"> 新增 </el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+        <el-button v-if="isUserAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add"> 新增 </el-button>
       </div>
       </div>
       <el-table
       <el-table
         v-loading="listLoading"
         v-loading="listLoading"
@@ -56,9 +56,9 @@
         <el-table-column label="操作" header-align="center" align="center" width="330" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="330" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
             <el-button v-if="isUserRole" type="warning" size="mini" @click="handleRole(row)"> 角色 </el-button>
             <el-button v-if="isUserRole" type="warning" size="mini" @click="handleRole(row)"> 角色 </el-button>
-            <el-button v-if="isUserEdit" type="primary" size="mini" @click="handleUpdate(row)"> 编辑 </el-button>
+            <el-button v-if="isUserEdit" type="primary" size="mini" @click="form_edit(row)"> 编辑 </el-button>
             <el-button v-if="isUserResetpassword" type="warning" size="mini" style="padding: 7px 5px;" @click="handleResetPassword(row)"> 重置密码 </el-button>
             <el-button v-if="isUserResetpassword" type="warning" size="mini" style="padding: 7px 5px;" @click="handleResetPassword(row)"> 重置密码 </el-button>
-            <el-button v-if="row.status !== '已删' && isUserDelete" size="mini" type="danger" @click="handleDelete(row)"> 删除 </el-button>
+            <el-button v-if="row.status !== '已删' && isUserDelete" size="mini" type="danger" @click="form_delete(row)"> 删除 </el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -109,7 +109,7 @@
 
 
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="updateData()"> 确认 </el-button>
+          <el-button type="primary" @click="edit_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisible = false"> 关闭 </el-button>
           <el-button @click="dialogFormVisible = false"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -161,7 +161,7 @@
 
 
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="createData()"> 确认 </el-button>
+          <el-button type="primary" @click="add_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisibleAdd = false"> 关闭 </el-button>
           <el-button @click="dialogFormVisibleAdd = false"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -304,7 +304,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -312,7 +312,7 @@ export default {
     resetRequestParam() {
     resetRequestParam() {
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisibleAdd = true
       this.dialogFormVisibleAdd = true
@@ -325,7 +325,7 @@ export default {
         this.dataform.maintenanceTypeId = []
         this.dataform.maintenanceTypeId = []
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       var role_Array = []
       var role_Array = []
       for (let i = 0; i < this.dataform.selectedRole.length; i++) {
       for (let i = 0; i < this.dataform.selectedRole.length; i++) {
         var role_obj = {}
         var role_obj = {}
@@ -505,7 +505,7 @@ export default {
         this.getList()
         this.getList()
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       if (row.maintenancePerson == 1) {
       if (row.maintenancePerson == 1) {
         this.updateParam.params[0] = row.id
         this.updateParam.params[0] = row.id
         GetDataByName(this.updateParam).then(response => {
         GetDataByName(this.updateParam).then(response => {
@@ -530,7 +530,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam = {}
           this.requestParam = {}
@@ -653,7 +653,7 @@ export default {
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除?', {
       MessageBox.confirm('确认删除?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
       }).then(() => {
       }).then(() => {

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

@@ -4,8 +4,8 @@
       <div class="filter-container">
       <div class="filter-container">
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="用户名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="用户名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
-        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
-        <el-button v-if="isUserAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate"> 新增 </el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+        <el-button v-if="isUserAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add"> 新增 </el-button>
       </div>
       </div>
       <el-table
       <el-table
         v-loading="listLoading"
         v-loading="listLoading"
@@ -56,9 +56,9 @@
         <el-table-column label="操作" header-align="center" align="center" width="330" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="330" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
            <el-button v-if="isUserRole" type="warning" size="mini" @click="handleRole(row)"> 角色 </el-button>
            <el-button v-if="isUserRole" type="warning" size="mini" @click="handleRole(row)"> 角色 </el-button>
-           <el-button v-if="isUserEdit" type="primary" size="mini" @click="handleUpdate(row)"> 编辑 </el-button>
+           <el-button v-if="isUserEdit" type="primary" size="mini" @click="form_edit(row)"> 编辑 </el-button>
            <el-button v-if="isUserResetpassword" type="warning" size="mini" style="padding: 7px 5px;" @click="handleResetPassword(row)"> 重置密码 </el-button>
            <el-button v-if="isUserResetpassword" type="warning" size="mini" style="padding: 7px 5px;" @click="handleResetPassword(row)"> 重置密码 </el-button>
-           <el-button v-if="row.status !== '已删' && isUserDelete" size="mini" type="danger" @click="handleDelete(row)"> 删除 </el-button>
+           <el-button v-if="row.status !== '已删' && isUserDelete" size="mini" type="danger" @click="form_delete(row)"> 删除 </el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -109,7 +109,7 @@
 
 
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="updateData()"> 确认 </el-button>
+          <el-button type="primary" @click="edit_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisible = false"> 关闭 </el-button>
           <el-button @click="dialogFormVisible = false"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -161,7 +161,7 @@
 
 
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="createData()"> 确认 </el-button>
+          <el-button type="primary" @click="add_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisibleAdd = false"> 关闭 </el-button>
           <el-button @click="dialogFormVisibleAdd = false"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -298,7 +298,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -306,7 +306,7 @@ export default {
     resetRequestParam() {
     resetRequestParam() {
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisibleAdd = true
       this.dialogFormVisibleAdd = true
@@ -319,7 +319,7 @@ export default {
         this.dataform.maintenanceTypeId = []
         this.dataform.maintenanceTypeId = []
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       var role_Array = []
       var role_Array = []
       for (let i = 0; i < this.dataform.selectedRole.length; i++) {
       for (let i = 0; i < this.dataform.selectedRole.length; i++) {
         var role_obj = {}
         var role_obj = {}
@@ -499,7 +499,7 @@ export default {
         this.getList()
         this.getList()
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       if (row.maintenancePerson == 1) {
       if (row.maintenancePerson == 1) {
         this.updateParam.params[0] = row.id
         this.updateParam.params[0] = row.id
         GetDataByName(this.updateParam).then(response => {
         GetDataByName(this.updateParam).then(response => {
@@ -524,7 +524,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam = {}
           this.requestParam = {}
@@ -639,7 +639,7 @@ export default {
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除?', {
       MessageBox.confirm('确认删除?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
       }).then(() => {
       }).then(() => {

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

@@ -4,8 +4,8 @@
       <div class="filter-container">
       <div class="filter-container">
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="用户名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empCode" placeholder="用户名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParm.parammaps.empname" placeholder="姓名" style="width: 140px;" class="filter-item" />
-        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
-        <el-button v-if="isUserAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate"> 新增 </el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+        <el-button v-if="isUserAdd" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add"> 新增 </el-button>
       </div>
       </div>
       <el-table
       <el-table
         v-loading="listLoading"
         v-loading="listLoading"
@@ -56,9 +56,9 @@
         <el-table-column label="操作" header-align="center" align="center" width="330" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" header-align="center" align="center" width="330" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
             <el-button v-if="isUserRole" type="warning" size="mini" @click="handleRole(row)"> 角色 </el-button>
             <el-button v-if="isUserRole" type="warning" size="mini" @click="handleRole(row)"> 角色 </el-button>
-            <el-button v-if="isUserEdit" type="primary" size="mini" @click="handleUpdate(row)"> 编辑 </el-button>
+            <el-button v-if="isUserEdit" type="primary" size="mini" @click="form_edit(row)"> 编辑 </el-button>
             <el-button v-if="isUserResetpassword" type="warning" size="mini" style="padding: 7px 5px;" @click="handleResetPassword(row)"> 重置密码 </el-button>
             <el-button v-if="isUserResetpassword" type="warning" size="mini" style="padding: 7px 5px;" @click="handleResetPassword(row)"> 重置密码 </el-button>
-            <el-button v-if="row.status !== '已删' && isUserDelete" size="mini" type="danger" @click="handleDelete(row)"> 删除 </el-button>
+            <el-button v-if="row.status !== '已删' && isUserDelete" size="mini" type="danger" @click="form_delete(row)"> 删除 </el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -109,7 +109,7 @@
 
 
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="updateData()"> 确认 </el-button>
+          <el-button type="primary" @click="edit_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisible = false"> 关闭 </el-button>
           <el-button @click="dialogFormVisible = false"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -161,7 +161,7 @@
 
 
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer">
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="createData()"> 确认 </el-button>
+          <el-button type="primary" @click="add_dialog_save()"> 确认 </el-button>
           <el-button @click="dialogFormVisibleAdd = false"> 关闭 </el-button>
           <el-button @click="dialogFormVisibleAdd = false"> 关闭 </el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -298,7 +298,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -306,7 +306,7 @@ export default {
     resetRequestParam() {
     resetRequestParam() {
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetRequestParam()
       this.resetRequestParam()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisibleAdd = true
       this.dialogFormVisibleAdd = true
@@ -319,7 +319,7 @@ export default {
         this.dataform.maintenanceTypeId = []
         this.dataform.maintenanceTypeId = []
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       var role_Array = []
       var role_Array = []
       for (let i = 0; i < this.dataform.selectedRole.length; i++) {
       for (let i = 0; i < this.dataform.selectedRole.length; i++) {
         var role_obj = {}
         var role_obj = {}
@@ -499,7 +499,7 @@ export default {
         this.getList()
         this.getList()
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       if (row.maintenancePerson == 1) {
       if (row.maintenancePerson == 1) {
         this.updateParam.params[0] = row.id
         this.updateParam.params[0] = row.id
         GetDataByName(this.updateParam).then(response => {
         GetDataByName(this.updateParam).then(response => {
@@ -524,7 +524,7 @@ export default {
         this.$refs['dataForm'].clearValidate()
         this.$refs['dataForm'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['dataForm'].validate(valid => {
       this.$refs['dataForm'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam = {}
           this.requestParam = {}
@@ -639,7 +639,7 @@ export default {
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除?', {
       MessageBox.confirm('确认删除?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
       }).then(() => {
       }).then(() => {

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

@@ -14,10 +14,10 @@
       <el-select v-model="getdataListParm.parammaps.feeType" placeholder="类型" style="width: 140px;" class="filter-item" clearable>
       <el-select v-model="getdataListParm.parammaps.feeType" placeholder="类型" style="width: 140px;" class="filter-item" clearable>
         <el-option v-for="item in getDictByName" :key="item.id" :label="item.label" :value="item.label" />
         <el-option v-for="item in getDictByName" :key="item.id" :label="item.label" :value="item.label" />
       </el-select>
       </el-select>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
     </div>
     </div>
     <div class="operation">
     <div class="operation">
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
       <el-button v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
         <el-button v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
@@ -75,9 +75,9 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-          <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
+          <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button type="danger" size="mini" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -138,8 +138,8 @@
         </el-row> -->
         </el-row> -->
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" @click="createData_again()">确认新增</el-button>
-        <el-button v-if="dialogStatus==='create' || dialogStatus==='update'" type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" @click="add_dialog_save_again()">确认新增</el-button>
+        <el-button v-if="dialogStatus==='create' || dialogStatus==='update'" type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false;getList()">关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -354,7 +354,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -370,7 +370,7 @@ export default {
       this.createTemp.unit = '预算:'
       this.createTemp.unit = '预算:'
       this.createTemp.unit2 = '内控:'
       this.createTemp.unit2 = '内控:'
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       console.log(this.createTemp)
       console.log(this.createTemp)
       this.edit = 1
       this.edit = 1
@@ -391,7 +391,7 @@ export default {
       this.edit = 1
       this.edit = 1
       this.getCreateDepartDownList()
       this.getCreateDepartDownList()
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertMonthbudget'
           this.requestParam.name = 'insertMonthbudget'
@@ -428,7 +428,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertMonthbudget'
           this.requestParam.name = 'insertMonthbudget'
@@ -454,7 +454,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.edit = 0
       this.edit = 0
       this.getDepartParam.parammaps.pastureId = row.pastureId
       this.getDepartParam.parammaps.pastureId = row.pastureId
       this.getCreateDepartDownList()
       this.getCreateDepartDownList()
@@ -473,7 +473,7 @@ export default {
         this.$refs['createTemp'].clearValidate()
         this.$refs['createTemp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateMonthbudget'
           this.requestParam.name = 'updateMonthbudget'
@@ -510,7 +510,7 @@ export default {
         this.createDepartList = response.data.list
         this.createDepartList = response.data.list
       })
       })
     },
     },
-    handleSee(row) {
+    form_see(row) {
       var unit = '预算(' + row.monthBudget.split('(')[1]
       var unit = '预算(' + row.monthBudget.split('(')[1]
       var unit2 = '内控(' + row.monthLimit.split('(')[1]
       var unit2 = '内控(' + row.monthLimit.split('(')[1]
       row.monthBudget = row.monthBudget.split('(')[0]
       row.monthBudget = row.monthBudget.split('(')[0]
@@ -646,7 +646,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('是否删除此条信息?', {
       MessageBox.confirm('是否删除此条信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -20,15 +20,15 @@
       <el-input v-model="getdataListParm.parammaps.assetName" placeholder="设备名称" clearable class="filter-item" style="width: 120px" />
       <el-input v-model="getdataListParm.parammaps.assetName" placeholder="设备名称" clearable class="filter-item" style="width: 120px" />
       <el-input v-model="getdataListParm.parammaps.employName" placeholder="加油工" clearable class="filter-item" style="width: 120px" />
       <el-input v-model="getdataListParm.parammaps.employName" placeholder="加油工" clearable class="filter-item" style="width: 120px" />
       <el-input v-model="getdataListParm.parammaps.oilClass" placeholder="加油工班" clearable class="filter-item" style="width: 120px" />
       <el-input v-model="getdataListParm.parammaps.oilClass" placeholder="加油工班" clearable class="filter-item" style="width: 120px" />
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-if="isDieselAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isDieselAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button v-if="isDieselExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownloadTemp">导出</el-button>
         <el-button v-if="isDieselExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownloadTemp">导出</el-button>
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
-          <el-button v-if="isRetreatImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="handleFilter">导入</el-button>
+          <el-button v-if="isRetreatImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="form_search">导入</el-button>
         </el-upload>
         </el-upload>
         <el-button v-if="isDieselExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">数据导出</el-button>
         <el-button v-if="isDieselExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">数据导出</el-button>
-        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="handleDelete">删除</el-button>
+        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -217,8 +217,8 @@
 
 
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" :disabled="isokDisable" type="success" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" :disabled="isokDisable" type="success" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -816,7 +816,7 @@ export default {
       this.getdataListParm.parammaps.deptName = ''
       this.getdataListParm.parammaps.deptName = ''
       this.getDepartDownList()
       this.getDepartDownList()
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       if (this.getdataListParm.parammaps.inputDatetime == null) {
       if (this.getdataListParm.parammaps.inputDatetime == null) {
@@ -843,7 +843,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp.cardNumber = ''
       this.temp.cardNumber = ''
       this.temp.price = ''
       this.temp.price = ''
       this.temp.oilAmount = ''
       this.temp.oilAmount = ''
@@ -855,9 +855,9 @@ export default {
       this.temp.selTime = parseTime(new Date(), '{y}-{m}-{d}')
       this.temp.selTime = parseTime(new Date(), '{y}-{m}-{d}')
       this.temp.note = ''
       this.temp.note = ''
     },
     },
-    handleCreate() {
+    form_add() {
       console.log(this.temp.DATE)
       console.log(this.temp.DATE)
-      this.resetTemp()
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.temp.empId = ''
       this.temp.empId = ''
@@ -867,7 +867,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -924,7 +924,7 @@ export default {
       })
       })
     },
     },
     // 继续新增
     // 继续新增
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -959,7 +959,7 @@ export default {
 
 
           ExecDataByConfig(this.postDataPramas).then(response => {
           ExecDataByConfig(this.postDataPramas).then(response => {
             if (response.msg !== 'fail') {
             if (response.msg !== 'fail') {
-              this.resetTemp()
+              this.form_reset()
               this.$nextTick(() => {
               this.$nextTick(() => {
                 this.$refs['temp'].clearValidate()
                 this.$refs['temp'].clearValidate()
               })
               })
@@ -977,7 +977,7 @@ export default {
       })
       })
     },
     },
 
 
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -987,7 +987,7 @@ export default {
     },
     },
 
 
     // 修改加油信息
     // 修改加油信息
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.postDataPramas.common = { 'returnmap': '0' }
           this.postDataPramas.common = { 'returnmap': '0' }
@@ -1073,7 +1073,7 @@ export default {
       this.dosageRecordTemp = Object(row, {})
       this.dosageRecordTemp = Object(row, {})
       this.getDosageRecordList()
       this.getDosageRecordList()
     },
     },
-    handleDelete() {
+    form_delete() {
       this.deleteTemp = {}
       this.deleteTemp = {}
       this.dialogStatus = 'delete'
       this.dialogStatus = 'delete'
       this.dialogFormDelete = true
       this.dialogFormDelete = true

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

@@ -17,14 +17,14 @@
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       </el-select>
       <el-date-picker v-model="getdataListParm.parammaps.createDate" type="date" placeholder="日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
       <el-date-picker v-model="getdataListParm.parammaps.createDate" type="date" placeholder="日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-if="isElecAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isElecAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button v-if="isElecExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
         <el-button v-if="isElecExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
-          <el-button v-if="isElecImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="handleFilter">导入</el-button>
+          <el-button v-if="isElecImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="form_search">导入</el-button>
         </el-upload>
         </el-upload>
-        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="handleDelete">删除</el-button>
+        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -115,7 +115,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isElecModify" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button v-if="isElecModify" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button type="primary" size="mini" style="width:70px" @click="handleDosageRecord(row)">用量记录</el-button>
           <el-button type="primary" size="mini" style="width:70px" @click="handleDosageRecord(row)">用量记录</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -210,8 +210,8 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -768,7 +768,7 @@ export default {
       this.getdataListParm.parammaps.departName = ''
       this.getdataListParm.parammaps.departName = ''
       this.getDepartDownList()
       this.getDepartDownList()
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       if(this.getdataListParm.parammaps.createDate == null){
       if(this.getdataListParm.parammaps.createDate == null){
@@ -783,7 +783,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp.pastureName = ''
       this.temp.pastureName = ''
       this.temp.useType = ''
       this.temp.useType = ''
       this.temp.departName = ''
       this.temp.departName = ''
@@ -806,8 +806,8 @@ export default {
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.pastureId = this.$store.state.user.pastureid
       this.temp.pastureId = this.$store.state.user.pastureid
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.temp.employeId = this.$store.state.user.employeid
       this.temp.employeId = this.$store.state.user.employeid
@@ -837,7 +837,7 @@ export default {
         this.$forceUpdate()
         this.$forceUpdate()
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -897,7 +897,7 @@ export default {
       })
       })
     },
     },
     // 继续新增
     // 继续新增
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -943,7 +943,7 @@ export default {
                 duration: 2000
                 duration: 2000
               })
               })
             } else {
             } else {
-              this.resetTemp()
+              this.form_reset()
               this.$notify({
               this.$notify({
                 title: '',
                 title: '',
                 message: '保存成功',
                 message: '保存成功',
@@ -955,7 +955,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       // if (this.temp.endAmount !== '' && this.temp.endAmount !== undefined && this.temp.endAmount !== null && this.temp.aAmount !== '' && this.temp.aAmount !== undefined && this.temp.aAmount !== null) {
       // if (this.temp.endAmount !== '' && this.temp.endAmount !== undefined && this.temp.endAmount !== null && this.temp.aAmount !== '' && this.temp.aAmount !== undefined && this.temp.aAmount !== null) {
       //   this.$set(this.temp, 'consumption', parseFloat(this.temp.endAmount) - parseFloat(this.temp.aAmount))
       //   this.$set(this.temp, 'consumption', parseFloat(this.temp.endAmount) - parseFloat(this.temp.aAmount))
@@ -966,7 +966,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.date = parseTime(new Date(), '{y}-{m}-{d}')
           this.temp.date = parseTime(new Date(), '{y}-{m}-{d}')
@@ -1016,7 +1016,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete() {
+    form_delete() {
       this.deleteTemp = {}
       this.deleteTemp = {}
       this.dialogStatus = 'delete'
       this.dialogStatus = 'delete'
       this.dialogFormDelete = true
       this.dialogFormDelete = true

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

@@ -16,14 +16,14 @@
       <el-select v-model="getdataListParm.parammaps.formType" clearable placeholder="表结构" class="filter-item">
       <el-select v-model="getdataListParm.parammaps.formType" clearable placeholder="表结构" class="filter-item">
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       </el-select>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-if="isGasExport" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isGasExport" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button v-if="isGasExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
         <el-button v-if="isGasExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
-          <el-button v-if="isGasImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="handleFilter">导入</el-button>
+          <el-button v-if="isGasImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="form_search">导入</el-button>
         </el-upload>
         </el-upload>
-        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="handleDelete">删除</el-button>
+        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -63,7 +63,7 @@
       <el-table-column label="备注" width="90px" align="center" prop="note" />
       <el-table-column label="备注" width="90px" align="center" prop="note" />
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isGasModify" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button v-if="isGasModify" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button type="primary" size="mini" style="width:70px" @click="handleDosageRecord(row)">用量记录</el-button>
           <el-button type="primary" size="mini" style="width:70px" @click="handleDosageRecord(row)">用量记录</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -155,8 +155,8 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -595,7 +595,7 @@ export default {
       this.getdataListParm.parammaps.departName = ''
       this.getdataListParm.parammaps.departName = ''
       this.getDepartDownList()
       this.getDepartDownList()
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -604,7 +604,7 @@ export default {
       this.$message({ message: '操作成功', type: 'success' })
       this.$message({ message: '操作成功', type: 'success' })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp.consumption = ''
       this.temp.consumption = ''
       this.temp.pastureName = ''
       this.temp.pastureName = ''
       this.temp.useType = ''
       this.temp.useType = ''
@@ -625,8 +625,8 @@ export default {
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.pastureId = this.$store.state.user.pastureid
       this.temp.pastureId = this.$store.state.user.pastureid
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.temp.employeId = this.$store.state.user.employeid
       this.temp.employeId = this.$store.state.user.employeid
@@ -656,7 +656,7 @@ export default {
         this.$forceUpdate()
         this.$forceUpdate()
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -702,7 +702,7 @@ export default {
       })
       })
     },
     },
     // 继续新增
     // 继续新增
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -740,14 +740,14 @@ export default {
             if (response.msg === 'fail') {
             if (response.msg === 'fail') {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
             } else {
-              this.resetTemp()
+              this.form_reset()
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
             }
             }
           })
           })
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       console.log(row)
       console.log(row)
       this.temp = Object.assign({}, row)
       this.temp = Object.assign({}, row)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -756,7 +756,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.date = parseTime(new Date(), '{y}-{m}-{d}')
           this.temp.date = parseTime(new Date(), '{y}-{m}-{d}')
@@ -795,7 +795,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete() {
+    form_delete() {
       this.deleteTemp = {}
       this.deleteTemp = {}
       this.dialogStatus = 'delete'
       this.dialogStatus = 'delete'
       this.dialogFormDelete = true
       this.dialogFormDelete = true

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

@@ -15,15 +15,15 @@
         <el-option v-for="item in energyTypeList" :key="item.id" :label="item.name" :value="item.name" />
         <el-option v-for="item in energyTypeList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       </el-select>
       <el-date-picker v-model="table.getdataListParm.parammaps.createDate" type="date" placeholder="日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
       <el-date-picker v-model="table.getdataListParm.parammaps.createDate" type="date" placeholder="日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
     </div>
     </div>
     <div class="operation">
     <div class="operation">
-      <el-button v-if="isGenerationAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+      <el-button v-if="isGenerationAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       <el-button v-if="isGenerationExport" class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
       <el-button v-if="isGenerationExport" class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
       <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
-        <el-button v-if="isGenerationImport" class="filter-item" type="warning" icon="el-icon-upload2" @click="handleFilter">导入</el-button>
+        <el-button v-if="isGenerationImport" class="filter-item" type="warning" icon="el-icon-upload2" @click="form_search">导入</el-button>
       </el-upload>
       </el-upload>
-      <el-button class="filter-item" type="danger" icon="el-icon-download" @click="handleDelete">删除</el-button>
+      <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button>
     </div>
     </div>
     <div class="table">
     <div class="table">
       <el-table
       <el-table
@@ -55,7 +55,7 @@
         <el-table-column label="预算达成率" min-width="90px" align="center" prop="budgetAchievementRate" />
         <el-table-column label="预算达成率" min-width="90px" align="center" prop="budgetAchievementRate" />
         <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button v-if="isGenerationEdit" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+            <el-button v-if="isGenerationEdit" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
             <el-button type="danger" size="mini" @click="handleRowDelete()(row)">删除</el-button>
             <el-button type="danger" size="mini" @click="handleRowDelete()(row)">删除</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
@@ -120,8 +120,8 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="create.dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="create.dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="create.dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="create.dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="create.dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -242,7 +242,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.getList()
       this.getList()
     },
     },
     getDownList() {
     getDownList() {
@@ -291,21 +291,21 @@ export default {
       }
       }
       return isLt2M
       return isLt2M
     },
     },
-    resetTemp() {
+    form_reset() {
       this.create.temp.pastureId = parseInt(Cookies.get('pastureid'))
       this.create.temp.pastureId = parseInt(Cookies.get('pastureid'))
       this.create.temp.departmentId = ''
       this.create.temp.departmentId = ''
       this.create.temp.employeId = Cookies.get('employeid')
       this.create.temp.employeId = Cookies.get('employeid')
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.edit = 1
       this.edit = 1
       this.create.dialogStatus = 'create'
       this.create.dialogStatus = 'create'
       this.create.dialogFormVisible = true
       this.create.dialogFormVisible = true
       this.getDepartParam.parammaps.pastureId = this.create.temp.pastureId
       this.getDepartParam.parammaps.pastureId = this.create.temp.pastureId
       this.getCreateDepartDownList()
       this.getCreateDepartDownList()
     },
     },
-    createData_again() {},
-    handleUpdate(row) {
+    add_dialog_save_again() {},
+    form_edit(row) {
       this.create.dialogStatus = 'update'
       this.create.dialogStatus = 'update'
       this.create.dialogFormVisible = true
       this.create.dialogFormVisible = true
       this.edit = 0
       this.edit = 0
@@ -327,9 +327,9 @@ export default {
       })
       })
     },
     },
     handleRowDelete() {},
     handleRowDelete() {},
-    updateData() {},
+    edit_dialog_save() {},
     handleDownload() {},
     handleDownload() {},
-    handleDelete() {}
+    form_delete() {}
   }
   }
 }
 }
 </script>
 </script>

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

@@ -65,7 +65,7 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <div>
       <div>
         <el-button
         <el-button
@@ -73,7 +73,7 @@
           class="filter-item"
           class="filter-item"
           type="primary"
           type="primary"
           icon="el-icon-edit"
           icon="el-icon-edit"
-          @click="handleCreate"
+          @click="form_add"
         >新增</el-button>
         >新增</el-button>
         <el-button
         <el-button
           v-if="isMethaneExport"
           v-if="isMethaneExport"
@@ -98,7 +98,7 @@
             class="filter-item"
             class="filter-item"
             type="warning"
             type="warning"
             icon="el-icon-upload2"
             icon="el-icon-upload2"
-            @click="handleFilter"
+            @click="form_search"
           >导入</el-button>
           >导入</el-button>
         </el-upload>
         </el-upload>
       </div>
       </div>
@@ -194,7 +194,7 @@
             v-if="isMethaneModify"
             v-if="isMethaneModify"
             type="success"
             type="success"
             size="mini"
             size="mini"
-            @click="handleUpdate(row)"
+            @click="form_edit(row)"
           >编辑</el-button>
           >编辑</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -339,9 +339,9 @@
           ref="createb"
           ref="createb"
           type="success"
           type="success"
           :disabled="isokDisable"
           :disabled="isokDisable"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >保存并新增</el-button>
         >保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -803,7 +803,7 @@ export default {
         this.findAllEmploye = response.data.findAllEmploye.list
         this.findAllEmploye = response.data.findAllEmploye.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -815,7 +815,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp.pastureName = ''
       this.temp.pastureName = ''
       this.temp.useType = ''
       this.temp.useType = ''
       this.temp.departName = ''
       this.temp.departName = ''
@@ -835,15 +835,15 @@ export default {
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.pastureId = this.$store.state.user.pastureid
       this.temp.pastureId = this.$store.state.user.pastureid
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -901,7 +901,7 @@ export default {
       })
       })
     },
     },
     // 继续新增
     // 继续新增
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -958,7 +958,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -966,7 +966,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           // this.requestParam.name = 'updatMethane'
           // this.requestParam.name = 'updatMethane'
@@ -1037,7 +1037,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('设备名称:' + row.equipmentName, '确认删除?', {
       MessageBox.confirm('设备名称:' + row.equipmentName, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -81,7 +81,7 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <div>
       <div>
         <el-button
         <el-button
@@ -89,7 +89,7 @@
           class="filter-item"
           class="filter-item"
           type="primary"
           type="primary"
           icon="el-icon-edit"
           icon="el-icon-edit"
-          @click="handleCreate"
+          @click="form_add"
         >新增</el-button>
         >新增</el-button>
         <!-- <el-button
         <!-- <el-button
           v-if="isRetreatExport"
           v-if="isRetreatExport"
@@ -122,7 +122,7 @@
             class="filter-item"
             class="filter-item"
             type="warning"
             type="warning"
             icon="el-icon-upload2"
             icon="el-icon-upload2"
-            @click="handleFilter"
+            @click="form_search"
           >导入</el-button>
           >导入</el-button>
         </el-upload>
         </el-upload>
       </div>
       </div>
@@ -361,8 +361,8 @@ export default {
       })
       })
     },
     },
 
 
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.temp.employeId = this.$store.state.user.employeid
       this.temp.employeId = this.$store.state.user.employeid
@@ -501,12 +501,12 @@ export default {
       }
       }
     },
     },
 
 
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    resetTemp() {}
+    form_reset() {}
   }
   }
 }
 }
 </script>
 </script>

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

@@ -17,14 +17,14 @@
       <el-select v-model="getdataListParm.parammaps.formType" clearable placeholder="表结构" class="filter-item">
       <el-select v-model="getdataListParm.parammaps.formType" clearable placeholder="表结构" class="filter-item">
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       </el-select>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-if="isSteamAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isSteamAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button v-if="isSteamExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
         <el-button v-if="isSteamExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
-          <el-button v-if="isSteamImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="handleFilter">导入</el-button>
+          <el-button v-if="isSteamImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="form_search">导入</el-button>
         </el-upload>
         </el-upload>
-        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="handleDelete">删除</el-button>
+        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -115,7 +115,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isSteamModify" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button v-if="isSteamModify" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button type="primary" size="mini" style="width:70px" @click="handleDosageRecord(row)">用量记录</el-button>
           <el-button type="primary" size="mini" style="width:70px" @click="handleDosageRecord(row)">用量记录</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -209,8 +209,8 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -801,7 +801,7 @@ export default {
       this.getdataListParm.parammaps.departName = ''
       this.getdataListParm.parammaps.departName = ''
       this.getDepartDownList()
       this.getDepartDownList()
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -813,7 +813,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp.consumption = ''
       this.temp.consumption = ''
       this.temp.pastureName = ''
       this.temp.pastureName = ''
       this.temp.useType = ''
       this.temp.useType = ''
@@ -836,8 +836,8 @@ export default {
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.pastureId = this.$store.state.user.pastureid
       this.temp.pastureId = this.$store.state.user.pastureid
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
@@ -866,7 +866,7 @@ export default {
         this.$forceUpdate()
         this.$forceUpdate()
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -926,7 +926,7 @@ export default {
       })
       })
     },
     },
     // 继续新增
     // 继续新增
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -972,7 +972,7 @@ export default {
                 duration: 2000
                 duration: 2000
               })
               })
             } else {
             } else {
-              this.resetTemp()
+              this.form_reset()
               this.$notify({
               this.$notify({
                 title: '',
                 title: '',
                 message: '保存成功',
                 message: '保存成功',
@@ -984,7 +984,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       // if (this.temp.endAmount !== '' && this.temp.endAmount !== undefined && this.temp.endAmount !== null && this.temp.aAmount !== '' && this.temp.aAmount !== undefined && this.temp.aAmount !== null) {
       // if (this.temp.endAmount !== '' && this.temp.endAmount !== undefined && this.temp.endAmount !== null && this.temp.aAmount !== '' && this.temp.aAmount !== undefined && this.temp.aAmount !== null) {
       //   this.$set(this.temp, 'consumption', parseFloat(this.temp.endAmount) - parseFloat(this.temp.aAmount))
       //   this.$set(this.temp, 'consumption', parseFloat(this.temp.endAmount) - parseFloat(this.temp.aAmount))
@@ -995,7 +995,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           // this.requestParam.name = 'updatSteam'
           // this.requestParam.name = 'updatSteam'
@@ -1068,7 +1068,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete() {
+    form_delete() {
       this.deleteTemp = {}
       this.deleteTemp = {}
       this.dialogStatus = 'delete'
       this.dialogStatus = 'delete'
       this.dialogFormDelete = true
       this.dialogFormDelete = true

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

@@ -17,14 +17,14 @@
       <el-select v-model="getdataListParm.parammaps.formType" clearable placeholder="表结构" class="filter-item">
       <el-select v-model="getdataListParm.parammaps.formType" clearable placeholder="表结构" class="filter-item">
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       </el-select>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-if="isWaterAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isWaterAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button v-if="isWaterExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
         <el-button v-if="isWaterExport" v-waves class="filter-item" type="success" icon="el-icon-download" @click="handleDownload">导出</el-button>
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
-          <el-button v-if="isWaterImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="handleFilter">导入</el-button>
+          <el-button v-if="isWaterImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2" @click="form_search">导入</el-button>
         </el-upload>
         </el-upload>
-        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="handleDelete">删除</el-button>
+        <el-button class="filter-item" type="danger" icon="el-icon-download" @click="form_delete">删除</el-button>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -105,7 +105,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isWaterModify" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button v-if="isWaterModify" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button type="primary" size="mini" style="width:70px" @click="handleDosageRecord(row)">用量记录</el-button>
           <el-button type="primary" size="mini" style="width:70px" @click="handleDosageRecord(row)">用量记录</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -199,8 +199,8 @@
         </el-row>
         </el-row>
       </el-form>
       </el-form>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -774,7 +774,7 @@ export default {
       this.getdataListParm.parammaps.departName = ''
       this.getdataListParm.parammaps.departName = ''
       this.getDepartDownList()
       this.getDepartDownList()
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getList()
       this.getList()
     },
     },
@@ -785,7 +785,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp.pastureName = ''
       this.temp.pastureName = ''
       this.temp.useType = ''
       this.temp.useType = ''
       this.temp.departName = ''
       this.temp.departName = ''
@@ -809,9 +809,9 @@ export default {
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.departmentId = this.$store.state.user.departmentid
       this.temp.pastureId = this.$store.state.user.pastureid
       this.temp.pastureId = this.$store.state.user.pastureid
     },
     },
-    handleCreate() {
+    form_add() {
       // console.log(this.temp.DATE)
       // console.log(this.temp.DATE)
-      this.resetTemp()
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.temp.employeId = this.$store.state.user.employeid
       this.temp.employeId = this.$store.state.user.employeid
@@ -841,7 +841,7 @@ export default {
         this.$forceUpdate()
         this.$forceUpdate()
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -901,7 +901,7 @@ export default {
       })
       })
     },
     },
     // 继续新增
     // 继续新增
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -947,7 +947,7 @@ export default {
                 duration: 2000
                 duration: 2000
               })
               })
             } else {
             } else {
-              this.resetTemp()
+              this.form_reset()
               this.$notify({
               this.$notify({
                 title: '',
                 title: '',
                 message: '保存成功',
                 message: '保存成功',
@@ -959,7 +959,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       // if (this.temp.endAmount !== '' && this.temp.endAmount !== undefined && this.temp.endAmount !== null && this.temp.aAmount !== '' && this.temp.aAmount !== undefined && this.temp.aAmount !== null) {
       // if (this.temp.endAmount !== '' && this.temp.endAmount !== undefined && this.temp.endAmount !== null && this.temp.aAmount !== '' && this.temp.aAmount !== undefined && this.temp.aAmount !== null) {
       //   this.$set(this.temp, 'consumption', parseFloat(this.temp.endAmount) - parseFloat(this.temp.aAmount))
       //   this.$set(this.temp, 'consumption', parseFloat(this.temp.endAmount) - parseFloat(this.temp.aAmount))
@@ -970,7 +970,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.temp.date = parseTime(new Date(), '{y}-{m}-{d}')
           this.temp.date = parseTime(new Date(), '{y}-{m}-{d}')
@@ -1021,7 +1021,7 @@ export default {
       })
       })
     },
     },
 
 
-    handleDelete() {
+    form_delete() {
       this.deleteTemp = {}
       this.deleteTemp = {}
       this.dialogStatus = 'delete'
       this.dialogStatus = 'delete'
       this.dialogFormDelete = true
       this.dialogFormDelete = true

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

@@ -12,10 +12,10 @@
         <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter1">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search1">搜索</el-button>
       <div>
       <div>
 
 
-        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
         <el-button v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
 
 
         <el-button    class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-upload2" @click="sapUpload">SAP上传</el-button>
         <el-button    class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-upload2" @click="sapUpload">SAP上传</el-button>
@@ -75,7 +75,7 @@
             </el-table-column>
             </el-table-column>
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <el-button v-if="row.statue==2 && (row.pastureId == loginPastureid)" type="success" size="mini" style="width:70px;display:inline-block" @click="handleReturn(row)">确认退回</el-button>
           <el-button v-if="row.statue==2 && (row.pastureId == loginPastureid)" type="success" size="mini" style="width:70px;display:inline-block" @click="handleReturn(row)">确认退回</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReturn(row)">确认退回</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReturn(row)">确认退回</el-button>
           <el-button v-if="row.statue==4 && (row.inPastureId == loginPastureid)" type="success" size="mini" style="display:inline-block" @click="handleReject(row)">驳回</el-button>
           <el-button v-if="row.statue==4 && (row.inPastureId == loginPastureid)" type="success" size="mini" style="display:inline-block" @click="handleReject(row)">驳回</el-button>
@@ -261,7 +261,7 @@
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():createData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():add_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -707,7 +707,7 @@ export default {
         return '调拨中'
         return '调拨中'
       }
       }
     },
     },
-    handleFilter1() {
+    form_search1() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
         this.getdataListParm.parammaps.inputDatetime = ''
         this.getdataListParm.parammaps.inputDatetime = ''
@@ -726,7 +726,7 @@ export default {
       this.createTemp.groupName = ''
       this.createTemp.groupName = ''
       this.listAdd = []
       this.listAdd = []
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.createTemp.applyCode = ''
       this.createTemp.applyCode = ''
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
@@ -809,7 +809,7 @@ export default {
       }
       }
       this.$forceUpdate()
       this.$forceUpdate()
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -823,16 +823,16 @@ export default {
                 console.log('新增申购单号', response.data.list[0].orderCode)
                 console.log('新增申购单号', response.data.list[0].orderCode)
                 this.createTemp.applyCode = response.data.list[0].orderCode
                 this.createTemp.applyCode = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         for (var j = 0; j < this.listAdd.length; j++) {
         for (var j = 0; j < this.listAdd.length; j++) {
           console.log(this.listAdd[j].amount)
           console.log(this.listAdd[j].amount)
@@ -947,7 +947,7 @@ export default {
       })
       })
     },
     },
     // 查看
     // 查看
-    handleSee(row) {
+    form_see(row) {
       this.dialogStatus = 'see'
       this.dialogStatus = 'see'
       this.dialogFormVisibleSee = true
       this.dialogFormVisibleSee = true
       row.pastureId = String(row.pastureId)
       row.pastureId = String(row.pastureId)

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

@@ -12,10 +12,10 @@
         <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter1">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search1">搜索</el-button>
       <div>
       <div>
 
 
-        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
         <el-button v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
       </div>
       </div>
     </div>
     </div>
@@ -62,7 +62,7 @@
       <el-table-column label="调拨状态" min-width="80px" align="center" :formatter="statue" />
       <el-table-column label="调拨状态" min-width="80px" align="center" :formatter="statue" />
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <el-button v-if="row.statue==2 && (row.pastureId == loginPastureid)" type="success" size="mini" style="width:70px;display:inline-block" @click="handleReturn(row)">确认退回</el-button>
           <el-button v-if="row.statue==2 && (row.pastureId == loginPastureid)" type="success" size="mini" style="width:70px;display:inline-block" @click="handleReturn(row)">确认退回</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReturn(row)">确认退回</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReturn(row)">确认退回</el-button>
           <el-button v-if="row.statue==4 && (row.inPastureId == loginPastureid)" type="success" size="mini" style="display:inline-block" @click="handleReject(row)">驳回</el-button>
           <el-button v-if="row.statue==4 && (row.inPastureId == loginPastureid)" type="success" size="mini" style="display:inline-block" @click="handleReject(row)">驳回</el-button>
@@ -248,7 +248,7 @@
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():createData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():add_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -581,7 +581,7 @@ export default {
         return '调拨中'
         return '调拨中'
       }
       }
     },
     },
-    handleFilter1() {
+    form_search1() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
         this.getdataListParm.parammaps.inputDatetime = ''
         this.getdataListParm.parammaps.inputDatetime = ''
@@ -600,7 +600,7 @@ export default {
       this.createTemp.groupName = ''
       this.createTemp.groupName = ''
       this.listAdd = []
       this.listAdd = []
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.createTemp.applyCode = ''
       this.createTemp.applyCode = ''
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
@@ -683,7 +683,7 @@ export default {
       }
       }
       this.$forceUpdate()
       this.$forceUpdate()
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -697,16 +697,16 @@ export default {
                 console.log('新增申购单号', response.data.list[0].orderCode)
                 console.log('新增申购单号', response.data.list[0].orderCode)
                 this.createTemp.applyCode = response.data.list[0].orderCode
                 this.createTemp.applyCode = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         for (var j = 0; j < this.listAdd.length; j++) {
         for (var j = 0; j < this.listAdd.length; j++) {
           console.log(this.listAdd[j].amount)
           console.log(this.listAdd[j].amount)
@@ -821,7 +821,7 @@ export default {
       })
       })
     },
     },
     // 查看
     // 查看
-    handleSee(row) {
+    form_see(row) {
       this.dialogStatus = 'see'
       this.dialogStatus = 'see'
       this.dialogFormVisibleSee = true
       this.dialogFormVisibleSee = true
       row.pastureId = String(row.pastureId)
       row.pastureId = String(row.pastureId)

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

@@ -40,13 +40,13 @@
             start-placeholder="审批时间"
             start-placeholder="审批时间"
             end-placeholder="审批时间"
             end-placeholder="审批时间"
           />
           />
-          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isBasicAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isBasicAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
             <el-button v-if="isBasicTemplate" v-waves class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp">模板</el-button>
             <el-button v-if="isBasicTemplate" v-waves class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp">模板</el-button>
             <el-button v-if="isDisable" v-waves class="filter-item" type="danger" icon="el-icon-remove-outline"  @click="handleBatchDisable">批量禁用</el-button>
             <el-button v-if="isDisable" v-waves class="filter-item" type="danger" icon="el-icon-remove-outline"  @click="handleBatchDisable">批量禁用</el-button>
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
-              <el-button v-if="isBasicImport" v-waves class="filter-item" type="warning" icon="el-icon-download" @click="handleFilter">导入</el-button>
+              <el-button v-if="isBasicImport" v-waves class="filter-item" type="warning" icon="el-icon-download" @click="form_search">导入</el-button>
             </el-upload>
             </el-upload>
             <el-button v-if="isBasicExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
             <el-button v-if="isBasicExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
             <el-button v-if="isEasSynchronization" class="filter-item" type="primary" style="float: right;" @click="handleEAS">EAS同步</el-button>
             <el-button v-if="isEasSynchronization" class="filter-item" type="primary" style="float: right;" @click="handleEAS">EAS同步</el-button>
@@ -123,8 +123,8 @@
           </el-table-column>
           </el-table-column>
           <el-table-column label="操作" align="center" width="350px" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" align="center" width="350px" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button v-if="isBasicSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-              <el-button v-if="isBasicEditTab1 && row.enable == 1" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+              <el-button v-if="isBasicSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+              <el-button v-if="isBasicEditTab1 && row.enable == 1" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
               <el-button v-if="isDisable && row.enable == 1" type="danger" size="mini" @click="handleDisable(row)">禁用</el-button>
               <el-button v-if="isDisable && row.enable == 1" type="danger" size="mini" @click="handleDisable(row)">禁用</el-button>
               <el-button v-if="isEnable && row.enable == 0" type="danger" size="mini" @click="handleEnable(row)">启用</el-button>
               <el-button v-if="isEnable && row.enable == 0" type="danger" size="mini" @click="handleEnable(row)">启用</el-button>
               <el-button v-if="isBasicDelete1 && row.enable == 1" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
               <el-button v-if="isBasicDelete1 && row.enable == 1" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
@@ -168,7 +168,7 @@
             start-placeholder="开始日期"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             end-placeholder="结束日期"
           />
           />
-          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilterSH">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchSH">搜索</el-button>
           <div>
           <div>
             <el-button v-if="isBasicExamine" class="filter-item" type="primary" @click="handleExamines">批量审批</el-button>
             <el-button v-if="isBasicExamine" class="filter-item" type="primary" @click="handleExamines">批量审批</el-button>
           </div>
           </div>
@@ -235,10 +235,10 @@
           </el-table-column>
           </el-table-column>
           <el-table-column label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button v-if="isBasicSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+              <el-button v-if="isBasicSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
               <!-- 编辑 -->
               <!-- 编辑 -->
-              <el-button v-if="isBasicEdit && row.statue==2" type="success" style="display:inline-block" size="mini" @click="handleUpdate(row)">编辑</el-button>
-              <el-button v-else type="success" style="display:none" size="mini" @click="handleUpdate(row)">编辑</el-button>
+              <el-button v-if="isBasicEdit && row.statue==2" type="success" style="display:inline-block" size="mini" @click="form_edit(row)">编辑</el-button>
+              <el-button v-else type="success" style="display:none" size="mini" @click="form_edit(row)">编辑</el-button>
               <el-button v-if="isBasicExamine && row.statue == 0" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
               <el-button v-if="isBasicExamine && row.statue == 0" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
               <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
               <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
 
 
@@ -377,8 +377,8 @@
         </el-form>
         </el-form>
       </div>
       </div>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="createData_again()">保存并新增</el-button>
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus==='create'" ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible = false;createTemp.partCode='';createTemp.partClass = '';createTemp.partClassNameCode = '';getList();">取消并关闭</el-button>
         <el-button @click="dialogFormVisible = false;createTemp.partCode='';createTemp.partClass = '';createTemp.partClassNameCode = '';getList();">取消并关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -1211,7 +1211,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
         this.getdataListParm.parammaps.inputDatetime = ''
         this.getdataListParm.parammaps.inputDatetime = ''
@@ -1220,7 +1220,7 @@ export default {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleFilterSH() {
+    form_searchSH() {
       this.listLoadingSH = true
       this.listLoadingSH = true
       if (this.getdataListParmSH.parammaps.inputDatetimeSH === null) {
       if (this.getdataListParmSH.parammaps.inputDatetimeSH === null) {
         this.getdataListParmSH.parammaps.inputDatetimeSH = ''
         this.getdataListParmSH.parammaps.inputDatetimeSH = ''
@@ -1229,7 +1229,7 @@ export default {
       this.getdataListParmSH.offset = 1
       this.getdataListParmSH.offset = 1
       this.getListSH()
       this.getListSH()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.activeName = 'first'
       this.activeName = 'first'
       this.seeTemp = Object.assign({}, row) // copy obj
       this.seeTemp = Object.assign({}, row) // copy obj
       if (this.seeTemp.srcpath !== undefined) {
       if (this.seeTemp.srcpath !== undefined) {
@@ -1290,7 +1290,7 @@ export default {
       this.createTemp.picId = ''
       this.createTemp.picId = ''
       this.createTemp.picpath = ''
       this.createTemp.picpath = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.createTemp.createPerson = this.$store.state.user.employeid
       this.createTemp.createPerson = this.$store.state.user.employeid
       this.partClassCreate = true
       this.partClassCreate = true
@@ -1394,7 +1394,7 @@ export default {
       })
       })
     },
     },
 
 
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1449,7 +1449,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData_again() {
+    add_dialog_save_again() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1529,7 +1529,7 @@ export default {
         this.$notify({ title: '成功', message: '启用成功', type: 'success', duration: 2000 })
         this.$notify({ title: '成功', message: '启用成功', type: 'success', duration: 2000 })
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.createTemp = Object.assign({}, row) // copy obj
       this.createTemp = Object.assign({}, row) // copy obj
       this.createTemp.partClass = this.createTemp.eqClassName1 + '/' + this.createTemp.eqClassName2 + '/' + this.createTemp.eqClassName3
       this.createTemp.partClass = this.createTemp.eqClassName1 + '/' + this.createTemp.eqClassName2 + '/' + this.createTemp.eqClassName3
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -1559,7 +1559,7 @@ export default {
         this.showUpload = false
         this.showUpload = false
       }
       }
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
           if (this.createTemp.picpath == '' || this.createTemp.picpath == undefined) {
           if (this.createTemp.picpath == '' || this.createTemp.picpath == undefined) {

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

@@ -21,9 +21,9 @@
             <el-option v-for="item in shStatues" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in shStatues" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
           <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isContractAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isContractAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
             <el-button v-if="isContractTemplate" v-waves class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp">模板</el-button>
             <el-button v-if="isContractTemplate" v-waves class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp">模板</el-button>
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
               <el-button v-if="isContractImport" v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
               <el-button v-if="isContractImport" v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
@@ -82,9 +82,9 @@
           <el-table-column label="审核状态" min-width="110px" align="center" :formatter="SHStatus" />
           <el-table-column label="审核状态" min-width="110px" align="center" :formatter="SHStatus" />
           <el-table-column label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button v-if="isContractSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+              <el-button v-if="isContractSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
               <el-button v-if="isContractChange && row.statue=='正常' && row.SHStatus == 7" type="warning" size="mini" @click="handleChange(row)">变更</el-button>
               <el-button v-if="isContractChange && row.statue=='正常' && row.SHStatus == 7" type="warning" size="mini" @click="handleChange(row)">变更</el-button>
-              <!-- <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button> -->
+              <!-- <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button> -->
               <!-- 设备主管审核 -->
               <!-- 设备主管审核 -->
               <el-button v-if="isContractExamineZG && row.SHStatus == 2" type="success" style="display:inline-block" size="mini" @click="handleExamine(row)">审核1</el-button>
               <el-button v-if="isContractExamineZG && row.SHStatus == 2" type="success" style="display:inline-block" size="mini" @click="handleExamine(row)">审核1</el-button>
               <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine(row)">审核1</el-button>
               <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine(row)">审核1</el-button>
@@ -96,8 +96,8 @@
               <!-- 设备中心审核 -->
               <!-- 设备中心审核 -->
               <el-button v-if="isContractExamineZX && row.SHStatus == 5" type="success" style="display:inline-block" size="mini" @click="handleExamine3(row)">审核2</el-button>
               <el-button v-if="isContractExamineZX && row.SHStatus == 5" type="success" style="display:inline-block" size="mini" @click="handleExamine3(row)">审核2</el-button>
               <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine3(row)">审核2</el-button>
               <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine3(row)">审核2</el-button>
-              <el-button v-if="isContractDelete && (row.SHStatus == 4 || row.SHStatus == 6 || row.SHStatus == 8) " type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-              <el-button v-if="isContractDelete2" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+              <el-button v-if="isContractDelete && (row.SHStatus == 4 || row.SHStatus == 6 || row.SHStatus == 8) " type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+              <el-button v-if="isContractDelete2" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
@@ -118,7 +118,7 @@
             <el-option v-for="item in findAllProvider" :key="item.id" :label="item.name" :value="item.name" />
             <el-option v-for="item in findAllProvider" :key="item.id" :label="item.name" :value="item.name" />
           </el-select>
           </el-select>
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter2">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search2">搜索</el-button>
         </div>
         </div>
         <el-table
         <el-table
           :key="tableKey2"
           :key="tableKey2"
@@ -486,7 +486,7 @@
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:5px">
         <div slot="footer" class="dialog-footer" style="bottom:5px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():createData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():add_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList();createTemp.providerName=''">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList();createTemp.providerName=''">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -1346,7 +1346,7 @@ export default {
         }, 300)
         }, 300)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
         this.getdataListParm.parammaps.inputDatetime = ''
         this.getdataListParm.parammaps.inputDatetime = ''
@@ -1384,7 +1384,7 @@ export default {
         }, 300)
         }, 300)
       })
       })
     },
     },
-    handleFilter2() {
+    form_search2() {
       this.listLoading2 = true
       this.listLoading2 = true
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
         this.getdataListParm2.parammaps.inputDatetime = ''
         this.getdataListParm2.parammaps.inputDatetime = ''
@@ -1463,7 +1463,7 @@ export default {
         return '是'
         return '是'
       }
       }
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.seeTemp = Object.assign({}, row) // copy obj
       this.seeTemp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'card'
       this.dialogStatus = 'card'
       this.dialogFormVisible_See = true
       this.dialogFormVisible_See = true
@@ -1548,7 +1548,7 @@ export default {
       this.createTemp.creatorTime = parseTime(new Date(), '{y}-{m}-{d}')
       this.createTemp.creatorTime = parseTime(new Date(), '{y}-{m}-{d}')
       this.createTemp.contractCode = ''
       this.createTemp.contractCode = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -1670,7 +1670,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1683,16 +1683,16 @@ export default {
                 console.log('合同编号', response.data.list[0].orderCode)
                 console.log('合同编号', response.data.list[0].orderCode)
                 this.createTemp.contractCode = response.data.list[0].orderCode
                 this.createTemp.contractCode = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         for (var j = 0; j < this.listAdd.length; j++) {
         for (var j = 0; j < this.listAdd.length; j++) {
           if (this.listAdd[j].planAmount == null || this.listAdd[j].brand == null || this.listAdd[j].price == null || this.listAdd[j].planAmount == '' || this.listAdd[j].brand === '' || this.listAdd[j].brandId === '' || this.listAdd[j].price == '' || this.listAdd[j].brand == undefined || this.listAdd[j].brandId == undefined) {
           if (this.listAdd[j].planAmount == null || this.listAdd[j].brand == null || this.listAdd[j].price == null || this.listAdd[j].planAmount == '' || this.listAdd[j].brand === '' || this.listAdd[j].brandId === '' || this.listAdd[j].price == '' || this.listAdd[j].brand == undefined || this.listAdd[j].brandId == undefined) {
@@ -2664,7 +2664,7 @@ export default {
 
 
     // 合同明细打印
     // 合同明细打印
 
 
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateStock'
           this.requestParam.name = 'updateStock'
@@ -2693,7 +2693,7 @@ export default {
       })
       })
     },
     },
     // 修改
     // 修改
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       // 基础信息
       // 基础信息
       this.defaultCheckedKeys = [this.temp.categoryId]
       this.defaultCheckedKeys = [this.temp.categoryId]
@@ -2720,7 +2720,7 @@ export default {
     },
     },
 
 
     // 删除
     // 删除
-    handleDelete(row) {
+    form_delete(row) {
       console.log('点击了删除')
       console.log('点击了删除')
       MessageBox.confirm('确认删除此条信息?', {
       MessageBox.confirm('确认删除此条信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',

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

@@ -70,7 +70,7 @@
             <el-table-column label="审批时间" sortable min-width="120px" align="center" prop="SHdateTime" />
             <el-table-column label="审批时间" sortable min-width="120px" align="center" prop="SHdateTime" />
             <el-table-column label="操作" align="center" width="350px" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" align="center" width="350px" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button v-if="tab1.contractManagement.isContractSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+                <el-button v-if="tab1.contractManagement.isContractSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
                 <el-button v-if="tab1.contractManagement.isContractSee" type="primary" style="width:70px;" size="mini" @click="handleTab1DetailsSpareParts(row)">备件明细</el-button>
                 <el-button v-if="tab1.contractManagement.isContractSee" type="primary" style="width:70px;" size="mini" @click="handleTab1DetailsSpareParts(row)">备件明细</el-button>
                 <el-button v-if="tab1.contractManagement.isContractSee" type="primary" style="width:70px;" size="mini" @click="handleTab1ChangeRecord(row)">变更记录</el-button>
                 <el-button v-if="tab1.contractManagement.isContractSee" type="primary" style="width:70px;" size="mini" @click="handleTab1ChangeRecord(row)">变更记录</el-button>
                 <el-button v-if="tab1.contractManagement.isContractChange && (row.statued == '正常' || row.statued == '已过期')" :disabled="parseInt(row.pastureId) == 18 && parseInt(isGroupAdministrator) !== 18" type="warning" size="mini" @click="handleTab1Change(row)">变更</el-button>
                 <el-button v-if="tab1.contractManagement.isContractChange && (row.statued == '正常' || row.statued == '已过期')" :disabled="parseInt(row.pastureId) == 18 && parseInt(isGroupAdministrator) !== 18" type="warning" size="mini" @click="handleTab1Change(row)">变更</el-button>
@@ -433,7 +433,7 @@
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer" style="bottom:5px">
         <div slot="footer" class="dialog-footer" style="bottom:5px">
           <el-button v-if="dialogStatus =='change'" type="primary" @click="terminationData()">终止合同</el-button>
           <el-button v-if="dialogStatus =='change'" type="primary" @click="terminationData()">终止合同</el-button>
-          <el-button v-if="dialogStatus !=='see'" type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():changeData()">保存并关闭</el-button>
+          <el-button v-if="dialogStatus !=='see'" type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():changeData()">保存并关闭</el-button>
           <el-button @click="tab1.contractManagement.create.dialogFormVisible = false;getTab1List();tab1.contractManagement.create.temp.providerName=''">取消并关闭</el-button>
           <el-button @click="tab1.contractManagement.create.dialogFormVisible = false;getTab1List();tab1.contractManagement.create.temp.providerName=''">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -617,9 +617,9 @@
         </el-form>
         </el-form>
       </div>
       </div>
       <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:10px">
       <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:10px">
-        <el-button v-if="dialogStatus=='tab1create2'" type="primary" :disabled="isokDisable" @click="createData2()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus=='tab1create2'" type="primary" :disabled="isokDisable" @click="add_dialog_save2()">保存并关闭</el-button>
         <el-button v-if="dialogStatus=='tab1change2'" type="primary" :disabled="isokDisable" @click="changeData2()">保存并关闭</el-button>
         <el-button v-if="dialogStatus=='tab1change2'" type="primary" :disabled="isokDisable" @click="changeData2()">保存并关闭</el-button>
-        <el-button v-if="dialogStatus=='tab1Update2'" type="primary" :disabled="isokDisable" @click="updateData2()">保存并关闭</el-button>
+        <el-button v-if="dialogStatus=='tab1Update2'" type="primary" :disabled="isokDisable" @click="edit_dialog_save2()">保存并关闭</el-button>
         <el-button @click="tab1.detailsSpareParts.create.dialogFormVisible = false;">关闭</el-button>
         <el-button @click="tab1.detailsSpareParts.create.dialogFormVisible = false;">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -1533,7 +1533,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       console.log('点击了新增保存')
       console.log('点击了新增保存')
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
@@ -1612,7 +1612,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleSee(row) {
+    form_see(row) {
       console.log('查看', row)
       console.log('查看', row)
       row.statue = String(row.statue)
       row.statue = String(row.statue)
       row.synchronousPasture2 = []
       row.synchronousPasture2 = []
@@ -2037,7 +2037,7 @@ export default {
       this.tab1.detailsSpareParts.requestSparePart.parammaps = {}
       this.tab1.detailsSpareParts.requestSparePart.parammaps = {}
       this.getClearImportExcelList()
       this.getClearImportExcelList()
     },
     },
-    createData2() {
+    add_dialog_save2() {
       console.log('备件明细-新增保存')
       console.log('备件明细-新增保存')
       if (this.tab1.detailsSpareParts.listAdd.length !== 0) {
       if (this.tab1.detailsSpareParts.listAdd.length !== 0) {
         for (let i = 0; i < this.tab1.detailsSpareParts.listAdd.length; i++) {
         for (let i = 0; i < this.tab1.detailsSpareParts.listAdd.length; i++) {
@@ -2424,7 +2424,7 @@ export default {
         this.tab1.detailsSpareParts.requestSparePart.name = 'getcontratListBybigParts'
         this.tab1.detailsSpareParts.requestSparePart.name = 'getcontratListBybigParts'
       }
       }
     },
     },
-    updateData2() {
+    edit_dialog_save2() {
       console.log('编辑保存')
       console.log('编辑保存')
       // 新增合同 || 变更日期
       // 新增合同 || 变更日期
       if (this.tab1.detailsSpareParts.updateList.SHtype == 0 || this.tab1.detailsSpareParts.updateList.SHtype == 3) {
       if (this.tab1.detailsSpareParts.updateList.SHtype == 0 || this.tab1.detailsSpareParts.updateList.SHtype == 3) {

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

@@ -42,11 +42,11 @@
         :checked-keys="defaultCheckedKeys"
         :checked-keys="defaultCheckedKeys"
         @popoverHide="popoverHide"
         @popoverHide="popoverHide"
       />
       />
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
         <el-button v-if="isCustomTemplate" v-waves class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp">模板</el-button>
         <el-button v-if="isCustomTemplate" v-waves class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp">模板</el-button>
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
         <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
-          <el-button v-if="isCustomImport" v-waves class="filter-item" type="warning" icon="el-icon-download" @click="handleFilterClear">导入</el-button>
+          <el-button v-if="isCustomImport" v-waves class="filter-item" type="warning" icon="el-icon-download" @click="form_searchClear">导入</el-button>
         </el-upload>
         </el-upload>
         <el-button v-if="isCustomExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
         <el-button v-if="isCustomExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
       </div>
       </div>
@@ -149,7 +149,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" width="200px" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="200px" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isCustomSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button v-if="isCustomSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <el-button type="success" style="width:70px" size="mini" @click="handleChange(row)">库位变更</el-button>
           <el-button type="success" style="width:70px" size="mini" @click="handleChange(row)">库位变更</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -263,7 +263,7 @@
               <div class="filter-container">
               <div class="filter-container">
                 <el-input v-model="getdataListParmStorage.parammaps.laidCode" placeholder="入库单号" style="width: 140px;" class="filter-item" />
                 <el-input v-model="getdataListParmStorage.parammaps.laidCode" placeholder="入库单号" style="width: 140px;" class="filter-item" />
                 <el-date-picker ref="inputDatetime" v-model="getdataListParmStorage.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                 <el-date-picker ref="inputDatetime" v-model="getdataListParmStorage.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterStorage">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchStorage">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -303,7 +303,7 @@
                 <el-input v-model="getdataListParmDelivery.parammaps.eqCode" placeholder="关联设备编号" style="width: 140px;" class="filter-item" />
                 <el-input v-model="getdataListParmDelivery.parammaps.eqCode" placeholder="关联设备编号" style="width: 140px;" class="filter-item" />
                 <el-input v-model="getdataListParmDelivery.parammaps.eqName" placeholder="关联设备名称" style="width: 140px;" class="filter-item" />
                 <el-input v-model="getdataListParmDelivery.parammaps.eqName" placeholder="关联设备名称" style="width: 140px;" class="filter-item" />
                 <el-date-picker ref="inputDatetime2" v-model="getdataListParmDelivery.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                 <el-date-picker ref="inputDatetime2" v-model="getdataListParmDelivery.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterDelivery">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchDelivery">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -341,7 +341,7 @@
               <div class="filter-container">
               <div class="filter-container">
                 <el-input v-model="getdataListParmCancelling.parammaps.useForm" placeholder="退库单号" style="width: 140px;" class="filter-item" />
                 <el-input v-model="getdataListParmCancelling.parammaps.useForm" placeholder="退库单号" style="width: 140px;" class="filter-item" />
                 <el-date-picker ref="inputDatetime3" v-model="getdataListParmCancelling.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                 <el-date-picker ref="inputDatetime3" v-model="getdataListParmCancelling.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterCancelling">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchCancelling">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -378,7 +378,7 @@
               <div class="filter-container">
               <div class="filter-container">
                 <el-input v-model="getdataListParmRefund.parammaps.useForm" placeholder="退货单号" style="width: 140px;" class="filter-item" />
                 <el-input v-model="getdataListParmRefund.parammaps.useForm" placeholder="退货单号" style="width: 140px;" class="filter-item" />
                 <el-date-picker ref="inputDatetime4" v-model="getdataListParmRefund.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                 <el-date-picker ref="inputDatetime4" v-model="getdataListParmRefund.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterRefund">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchRefund">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -415,7 +415,7 @@
               <div class="filter-container">
               <div class="filter-container">
                 <el-input v-model="getdataListParmRecord.parammaps.oddCode" placeholder="盘点单号" style="width: 140px;" class="filter-item" />
                 <el-input v-model="getdataListParmRecord.parammaps.oddCode" placeholder="盘点单号" style="width: 140px;" class="filter-item" />
                 <el-date-picker ref="inputDatetime5" v-model="getdataListParmRecord.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
                 <el-date-picker ref="inputDatetime5" v-model="getdataListParmRecord.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilterRecord">搜索</el-button>
+                <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchRecord">搜索</el-button>
               </div>
               </div>
               <el-table
               <el-table
                 :key="tableKey"
                 :key="tableKey"
@@ -936,7 +936,7 @@ export default {
         return '是'
         return '是'
       }
       }
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.defaultCheckedKeys = [this.temp.categoryId]
       this.defaultCheckedKeys = [this.temp.categoryId]
       this.dialogStatusCard = 'card'
       this.dialogStatusCard = 'card'
       this.activeName = 'first'
       this.activeName = 'first'
@@ -1063,13 +1063,13 @@ export default {
     handleSelectProvider(item) {
     handleSelectProvider(item) {
       console.log('供应商模糊查询选中值', item)
       console.log('供应商模糊查询选中值', item)
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getdataListParm.pastureName = Cookies.get('pasturename')
       this.getdataListParm.pastureName = Cookies.get('pasturename')
       this.getList()
       this.getList()
     },
     },
-    handleFilterClear() {
+    form_searchClear() {
       this.listLoading = true
       this.listLoading = true
       this.beforeUploading()
       this.beforeUploading()
     },
     },
@@ -1218,7 +1218,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       // 格式化日期
       // 格式化日期
       parseTime(new Date(), '{y}-{m}-{d}')
       parseTime(new Date(), '{y}-{m}-{d}')
       this.defaultCheckedKeys = []
       this.defaultCheckedKeys = []
@@ -1344,7 +1344,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterStorage() {
+    form_searchStorage() {
       this.listLoadingStorage = true
       this.listLoadingStorage = true
       if (this.getdataListParmStorage.parammaps.inputDatetime === null) {
       if (this.getdataListParmStorage.parammaps.inputDatetime === null) {
         this.getdataListParmStorage.parammaps.inputDatetime = ''
         this.getdataListParmStorage.parammaps.inputDatetime = ''
@@ -1375,7 +1375,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterDelivery() {
+    form_searchDelivery() {
       this.listLoadingDelivery = true
       this.listLoadingDelivery = true
       this.getdataListParmDelivery.offset = 1
       this.getdataListParmDelivery.offset = 1
       this.getCardDelivery()
       this.getCardDelivery()
@@ -1404,7 +1404,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterCancelling() {
+    form_searchCancelling() {
       this.listLoadingCancelling = true
       this.listLoadingCancelling = true
       this.getdataListParmCancelling.offset = 1
       this.getdataListParmCancelling.offset = 1
       this.getCardCancelling()
       this.getCardCancelling()
@@ -1432,7 +1432,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterRefund() {
+    form_searchRefund() {
       this.listLoadingRefund = true
       this.listLoadingRefund = true
       this.getdataListParmRefund.offset = 1
       this.getdataListParmRefund.offset = 1
       this.getCardRefund()
       this.getCardRefund()
@@ -1460,7 +1460,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterRecord() {
+    form_searchRecord() {
       this.listLoadingRefund = true
       this.listLoadingRefund = true
       this.getdataListParmRecord.offset = 1
       this.getdataListParmRecord.offset = 1
       this.getCardRecord()
       this.getCardRecord()

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

@@ -27,9 +27,9 @@
         start-placeholder="开始日期"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
         end-placeholder="结束日期"
       />
       />
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -91,9 +91,9 @@
 
 
       <el-table-column label="操作" align="center" width="240px" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="240px" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-          <el-button v-if="row.statue == 0" type="success" size="mini" @click="handleUpdate(row)">盘点</el-button>
-          <el-button v-if="row.statue == 0" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
+          <el-button v-if="row.statue == 0" type="success" size="mini" @click="form_edit(row)">盘点</el-button>
+          <el-button v-if="row.statue == 0" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -265,7 +265,7 @@
         @pagination="gettempSolrList2"
         @pagination="gettempSolrList2"
       />
       />
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" type="primary" @click="createData()">确认</el-button>
+        <el-button v-if="dialogStatus==='create'" type="primary" @click="add_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -300,7 +300,7 @@
           <el-select v-model="gettempSolr3.parammaps.inventoryStatue" placeholder="库存筛选" class="filter-item" clearable>
           <el-select v-model="gettempSolr3.parammaps.inventoryStatue" placeholder="库存筛选" class="filter-item" clearable>
             <el-option v-for="item in inventoryScreening" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in inventoryScreening" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
-          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilterDelivery">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchDelivery">搜索</el-button>
 
 
           <!-- <el-col :span="8">
           <!-- <el-col :span="8">
             <el-form-item label="盘点人:" prop="employeId">
             <el-form-item label="盘点人:" prop="employeId">
@@ -420,7 +420,7 @@
         @pagination="gettempSolrList3"
         @pagination="gettempSolrList3"
       />
       />
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="updateData()">完成盘点</el-button>
+        <el-button type="primary" @click="edit_dialog_save()">完成盘点</el-button>
         <el-button @click="dialogFormVisible3 = false">关闭</el-button>
         <el-button @click="dialogFormVisible3 = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -828,7 +828,7 @@ export default {
         // }
         // }
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
         this.getdataListParm.parammaps.inputDatetime = ''
         this.getdataListParm.parammaps.inputDatetime = ''
@@ -844,7 +844,7 @@ export default {
       row.status = status
       row.status = status
     },
     },
 
 
-    createData() {
+    add_dialog_save() {
       var send_data1 = {
       var send_data1 = {
         'common': {
         'common': {
           'returnmap': '0'
           'returnmap': '0'
@@ -893,7 +893,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    resetTemp() {
+    form_reset() {
       this.pageNum21 = 1
       this.pageNum21 = 1
       this.pageSize21 = 10
       this.pageSize21 = 10
       this.pageNum22 = 1
       this.pageNum22 = 1
@@ -910,8 +910,8 @@ export default {
       }
       }
     },
     },
 
 
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
 
 
@@ -945,8 +945,8 @@ export default {
       })
       })
     },
     },
 
 
-    handleSee(row) {
-      this.resetTemp()
+    form_see(row) {
+      this.form_reset()
       console.log('row', row)
       console.log('row', row)
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.temp.employeId = row.checkId
       this.temp.employeId = row.checkId
@@ -994,7 +994,7 @@ export default {
       })
       })
     },
     },
 
 
-    handleFilterDelivery() {
+    form_searchDelivery() {
       this.gettempSolrList3()
       this.gettempSolrList3()
       this.gettempSolr3.parammaps.eqClass = this.createTemp.partClass
       this.gettempSolr3.parammaps.eqClass = this.createTemp.partClass
     },
     },
@@ -1016,7 +1016,7 @@ export default {
     },
     },
     // 编辑
     // 编辑
 
 
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp3 = Object.assign({}, row) // copy obj
       this.temp3 = Object.assign({}, row) // copy obj
       this.dialogFormVisible3 = true
       this.dialogFormVisible3 = true
 
 
@@ -1033,7 +1033,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp3'].validate(valid => {
       this.$refs['temp3'].validate(valid => {
         if (valid) {
         if (valid) {
           var send_data3 = {
           var send_data3 = {
@@ -1066,7 +1066,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除?', {
       MessageBox.confirm('确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -77,7 +77,7 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <div>
       <div>
         <el-upload
         <el-upload
@@ -107,7 +107,7 @@
         <el-button
         <el-button
           style="position: absolute;"
           style="position: absolute;"
           type="danger"
           type="danger"
-          @click="handleDelete(selection)"
+          @click="form_delete(selection)"
         >批量删除
         >批量删除
         </el-button>
         </el-button>
       </div>
       </div>
@@ -470,7 +470,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoadingImportInfo = true
       this.listLoadingImportInfo = true
       this.getdataListParmImportInfo.offset = 1
       this.getdataListParmImportInfo.offset = 1
       this.getListImportInfo()
       this.getListImportInfo()
@@ -489,7 +489,7 @@ export default {
         this.getDictByName3 = response.data.getDictByName3.list
         this.getDictByName3 = response.data.getDictByName3.list
       })
       })
     },
     },
-    resetTemp() {
+    form_reset() {
       // this.temp.typeName = ''
       // this.temp.typeName = ''
       // this.temp.assTypeId = ''
       // this.temp.assTypeId = ''
       this.temp.note = ''
       this.temp.note = ''
@@ -661,7 +661,7 @@ export default {
       this.selection = val
       this.selection = val
     },
     },
     // 删除
     // 删除
-    handleDelete(selection) {
+    form_delete(selection) {
       // console.log('selection', selection)
       // console.log('selection', selection)
       this.parammapsId = []
       this.parammapsId = []
       for (var i = 0; i < selection.length; i++) {
       for (var i = 0; i < selection.length; i++) {

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

@@ -33,9 +33,9 @@
             start-placeholder="开始日期"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             end-placeholder="结束日期"
           />
           />
-          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isOutStockAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isOutStockAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
             <el-button v-if="isReceiveTemplate" v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
             <el-button v-if="isReceiveTemplate" v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
               <el-button v-if="isOutStockImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
               <el-button v-if="isOutStockImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
@@ -115,8 +115,8 @@
             </el-table-column>
             </el-table-column>
           <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button v-if="isOutStockSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-              <!-- <el-button v-if="isStorageSee" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button> -->
+              <el-button v-if="isOutStockSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+              <!-- <el-button v-if="isStorageSee" type="success" size="mini" @click="form_edit(row)">编辑</el-button> -->
               <el-button v-if="isOutStockDelete && row.useType !== 4" style="display:inline-block" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
               <el-button v-if="isOutStockDelete && row.useType !== 4" style="display:inline-block" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
               <el-button v-else type="danger" size="mini" style="display:none" @click="handleDelate(row)">删除</el-button>
               <el-button v-else type="danger" size="mini" style="display:none" @click="handleDelate(row)">删除</el-button>
             </template>
             </template>
@@ -155,7 +155,7 @@
           />
           />
           <el-input v-model="getdataListParm2.parammaps.eqName" placeholder="设备名称" style="width: 200px;" class="filter-item" />
           <el-input v-model="getdataListParm2.parammaps.eqName" placeholder="设备名称" style="width: 200px;" class="filter-item" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter2">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search2">搜索</el-button>
           <el-button v-if="isOutStockExport" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload2">导出</el-button>
           <el-button v-if="isOutStockExport" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload2">导出</el-button>
         </div>
         </div>
         <el-table
         <el-table
@@ -699,7 +699,7 @@
           style="width: 800px; margin-left:50px;"
           style="width: 800px; margin-left:50px;"
         />
         />
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -1616,7 +1616,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter2() {
+    form_search2() {
       this.listLoading2 = true
       this.listLoading2 = true
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
         this.getdataListParm2.parammaps.inputDatetime = ''
         this.getdataListParm2.parammaps.inputDatetime = ''
@@ -1641,7 +1641,7 @@ export default {
       }
       }
     },
     },
 
 
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
@@ -1650,7 +1650,7 @@ export default {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       console.log(this.seeTemp)
       console.log(this.seeTemp)
       // this.temp = Object.assign({}, row) // copy obj
       // this.temp = Object.assign({}, row) // copy obj
@@ -1735,7 +1735,7 @@ export default {
       this.No3 = false
       this.No3 = false
       this.orderPart = {}
       this.orderPart = {}
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.edit = 1
       this.edit = 1
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
@@ -2092,7 +2092,7 @@ export default {
         this.TotalAmount = this.TotalAmount.toFixed(2)
         this.TotalAmount = this.TotalAmount.toFixed(2)
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -2105,16 +2105,16 @@ export default {
                 console.log('新增领用单号', response.data.list[0].orderCode)
                 console.log('新增领用单号', response.data.list[0].orderCode)
                 this.createTemp.useForm = response.data.list[0].orderCode
                 this.createTemp.useForm = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         if (this.createTemp.useType === 0) {
         if (this.createTemp.useType === 0) {
           // 领用出库
           // 领用出库
@@ -2870,7 +2870,7 @@ export default {
     // ---------------------------------------
     // ---------------------------------------
 
 
     // 编辑--- 修改保存
     // 编辑--- 修改保存
-    updateData() {
+    edit_dialog_save() {
       console.log('编辑保存')
       console.log('编辑保存')
     },
     },
 
 

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

@@ -33,9 +33,9 @@
             start-placeholder="开始日期"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             end-placeholder="结束日期"
           />
           />
-          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isOutStockAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isOutStockAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
             <el-button v-if="isReceiveTemplate" v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
             <el-button v-if="isReceiveTemplate" v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button>
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
               <el-button v-if="isOutStockImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
               <el-button v-if="isOutStockImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
@@ -99,8 +99,8 @@
           </el-table-column>
           </el-table-column>
           <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button v-if="isOutStockSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-              <!-- <el-button v-if="isStorageSee" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button> -->
+              <el-button v-if="isOutStockSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+              <!-- <el-button v-if="isStorageSee" type="success" size="mini" @click="form_edit(row)">编辑</el-button> -->
               <el-button v-if="isOutStockDelete && row.useType !== 4" style="display:inline-block" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
               <el-button v-if="isOutStockDelete && row.useType !== 4" style="display:inline-block" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
               <el-button v-else type="danger" size="mini" style="display:none" @click="handleDelate(row)">删除</el-button>
               <el-button v-else type="danger" size="mini" style="display:none" @click="handleDelate(row)">删除</el-button>
             </template>
             </template>
@@ -139,7 +139,7 @@
           />
           />
           <el-input v-model="getdataListParm2.parammaps.eqName" placeholder="设备名称" style="width: 200px;" class="filter-item" />
           <el-input v-model="getdataListParm2.parammaps.eqName" placeholder="设备名称" style="width: 200px;" class="filter-item" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter2">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search2">搜索</el-button>
           <el-button v-if="isOutStockExport" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload2">导出</el-button>
           <el-button v-if="isOutStockExport" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload2">导出</el-button>
         </div>
         </div>
         <el-table
         <el-table
@@ -683,7 +683,7 @@
           style="width: 800px; margin-left:50px;"
           style="width: 800px; margin-left:50px;"
         />
         />
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -1496,7 +1496,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter2() {
+    form_search2() {
       this.listLoading2 = true
       this.listLoading2 = true
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
         this.getdataListParm2.parammaps.inputDatetime = ''
         this.getdataListParm2.parammaps.inputDatetime = ''
@@ -1521,7 +1521,7 @@ export default {
       }
       }
     },
     },
 
 
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
@@ -1530,7 +1530,7 @@ export default {
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       console.log(this.seeTemp)
       console.log(this.seeTemp)
       // this.temp = Object.assign({}, row) // copy obj
       // this.temp = Object.assign({}, row) // copy obj
@@ -1615,7 +1615,7 @@ export default {
       this.No3 = false
       this.No3 = false
       this.orderPart = {}
       this.orderPart = {}
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.edit = 1
       this.edit = 1
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
@@ -1972,7 +1972,7 @@ export default {
         this.TotalAmount = this.TotalAmount.toFixed(2)
         this.TotalAmount = this.TotalAmount.toFixed(2)
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1985,16 +1985,16 @@ export default {
                 console.log('新增领用单号', response.data.list[0].orderCode)
                 console.log('新增领用单号', response.data.list[0].orderCode)
                 this.createTemp.useForm = response.data.list[0].orderCode
                 this.createTemp.useForm = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         if (this.createTemp.useType === 0) {
         if (this.createTemp.useType === 0) {
           // 领用出库
           // 领用出库
@@ -2750,7 +2750,7 @@ export default {
     // ---------------------------------------
     // ---------------------------------------
 
 
     // 编辑--- 修改保存
     // 编辑--- 修改保存
-    updateData() {
+    edit_dialog_save() {
       console.log('编辑保存')
       console.log('编辑保存')
     },
     },
 
 

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

@@ -233,7 +233,7 @@
               <el-option v-for="item in status2" :key="item.id" :label="item.name" :value="item.id" />
               <el-option v-for="item in status2" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
             </el-select>
             <el-date-picker ref="inputDatetime4" v-model="getdataListParm4.parammaps.inputDatetime" 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="inputDatetime4" v-model="getdataListParm4.parammaps.inputDatetime" 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="handleFilter4">搜索</el-button>
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search4">搜索</el-button>
 
 
             
             
             
             
@@ -285,11 +285,11 @@
            
            
             <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button v-if="isPurchaseSee" type="primary" size="mini" @click="handleSee4(row)">查看</el-button>
+                <el-button v-if="isPurchaseSee" type="primary" size="mini" @click="form_see4(row)">查看</el-button>
                 <el-button v-if="parseFloat(row.statue) === 0 && isExamineDM" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-if="parseFloat(row.statue) === 0 && isExamineDM" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-else style="display:none;" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
                 <el-button v-else style="display:none;" type="success" size="mini" @click="handleExamine(row)">审核</el-button>
-                <el-button v-if="parseFloat(row.statue) === 2" type="success" style="display:inline-block" size="mini" @click="handleUpdate(row)">编辑</el-button>
-                <el-button v-else style="display:none;" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+                <el-button v-if="parseFloat(row.statue) === 2" type="success" style="display:inline-block" size="mini" @click="form_edit(row)">编辑</el-button>
+                <el-button v-else style="display:none;" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
@@ -549,7 +549,7 @@
                 </el-table-column>
                 </el-table-column>
               </el-table>
               </el-table>
               <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:10px">
               <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:10px">
-                <el-button type="primary" :disabled="isokDisable" @click="updateData()">确认</el-button>
+                <el-button type="primary" :disabled="isokDisable" @click="edit_dialog_save()">确认</el-button>
                 <el-button @click="dialogFormVisibleUpdate4 = false;">关闭</el-button>
                 <el-button @click="dialogFormVisibleUpdate4 = false;">关闭</el-button>
               </div>
               </div>
             </div>
             </div>
@@ -594,7 +594,7 @@
             </el-select>
             </el-select>
             <el-autocomplete v-model="getdataListParm2.parammaps.providerName" value-key="providerName" class="inline-input" :fetch-suggestions="providerSearch" placeholder="供应商" style="width:150px;top:-3px;" @select="handleSelectProvider" />
             <el-autocomplete v-model="getdataListParm2.parammaps.providerName" value-key="providerName" class="inline-input" :fetch-suggestions="providerSearch" placeholder="供应商" style="width:150px;top:-3px;" @select="handleSelectProvider" />
             <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" 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="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" 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="handleFilter2">搜索</el-button>
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search2">搜索</el-button>
             <el-button v-waves v-if="isPurchaseSap" class="filter-item" type="primary" @click="sapUpload">SAP上传</el-button>
             <el-button v-waves v-if="isPurchaseSap" class="filter-item" type="primary" @click="sapUpload">SAP上传</el-button>
             <el-button v-waves  v-if="isPurchaseSrm" class="filter-item" type="primary" @click="srmUpload">SRM上传</el-button>
             <el-button v-waves  v-if="isPurchaseSrm" class="filter-item" type="primary" @click="srmUpload">SRM上传</el-button>
           </div>
           </div>
@@ -664,7 +664,7 @@
             </el-table-column>
             </el-table-column>
             <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width" fixed="right">
             <el-table-column label="操作" align="center" width="250px" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button v-if="isPurchaseSee" type="primary" size="mini" @click="handleSee2(row)">查看</el-button>
+                <el-button v-if="isPurchaseSee" type="primary" size="mini" @click="form_see2(row)">查看</el-button>
                 <el-button v-if="(row.statu === 2 || row.statu === 4) && isPurchaseClose" style="display:none" type="danger" size="mini" @click="handleClose2(row)">关闭</el-button>
                 <el-button v-if="(row.statu === 2 || row.statu === 4) && isPurchaseClose" style="display:none" type="danger" size="mini" @click="handleClose2(row)">关闭</el-button>
                 <el-button v-else-if="isPurchaseClose" style="display:inline-block" type="danger" size="mini" @click="handleClose2(row)">关闭</el-button>
                 <el-button v-else-if="isPurchaseClose" style="display:inline-block" type="danger" size="mini" @click="handleClose2(row)">关闭</el-button>
               </template>
               </template>
@@ -852,7 +852,7 @@
               <el-option v-for="item in isStorages" :key="item.id" :label="item.name" :value="item.id" />
               <el-option v-for="item in isStorages" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
             </el-select>
             <el-date-picker ref="inputDatetime3" v-model="getdataListParm3.parammaps.inputDatetime" 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="inputDatetime3" v-model="getdataListParm3.parammaps.inputDatetime" 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="handleFilter3">搜索</el-button>
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search3">搜索</el-button>
             <el-button v-if="isPurchaseExport" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload3">导出</el-button>
             <el-button v-if="isPurchaseExport" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload3">导出</el-button>
           </div>
           </div>
           <el-table
           <el-table
@@ -1788,7 +1788,7 @@ export default {
         }, 300)
         }, 300)
       })
       })
     },
     },
-    handleFilter2() {
+    form_search2() {
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
         this.getdataListParm2.parammaps.inputDatetime = ''
         this.getdataListParm2.parammaps.inputDatetime = ''
@@ -1822,7 +1822,7 @@ export default {
         return '未通过'
         return '未通过'
       }
       }
     },
     },
-    handleSee2(row) {
+    form_see2(row) {
       this.temp2 = Object.assign({}, row)
       this.temp2 = Object.assign({}, row)
       if (this.temp2.statu === 0) {
       if (this.temp2.statu === 0) {
         this.isStatu = false
         this.isStatu = false
@@ -2142,7 +2142,7 @@ export default {
         }, 300)
         }, 300)
       })
       })
     },
     },
-    handleFilter3() {
+    form_search3() {
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm3.parammaps.inputDatetime === null) {
       if (this.getdataListParm3.parammaps.inputDatetime === null) {
         this.getdataListParm3.parammaps.inputDatetime = ''
         this.getdataListParm3.parammaps.inputDatetime = ''
@@ -2206,7 +2206,7 @@ export default {
         }, 300)
         }, 300)
       })
       })
     },
     },
-    handleFilter4() {
+    form_search4() {
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm4.parammaps.inputDatetime === null) {
       if (this.getdataListParm4.parammaps.inputDatetime === null) {
         this.getdataListParm4.parammaps.inputDatetime = ''
         this.getdataListParm4.parammaps.inputDatetime = ''
@@ -2214,7 +2214,7 @@ export default {
       this.getdataListParm4.offset = 1
       this.getdataListParm4.offset = 1
       this.getList4()
       this.getList4()
     },
     },
-    handleSee4(row) {
+    form_see4(row) {
       this.dialogStatusSee4 = 'see'
       this.dialogStatusSee4 = 'see'
       this.dialogFormVisibleSee4 = true
       this.dialogFormVisibleSee4 = true
       this.temp4 = Object.assign({}, row)
       this.temp4 = Object.assign({}, row)
@@ -2363,14 +2363,14 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.dialogStatusUpdate4 = 'update'
       this.dialogStatusUpdate4 = 'update'
       this.dialogFormVisibleUpdate4 = true
       this.dialogFormVisibleUpdate4 = true
       this.getdataListSee4.parammaps.matchCode = row.matchCode
       this.getdataListSee4.parammaps.matchCode = row.matchCode
       this.updateTemp4 = Object.assign(row, {})
       this.updateTemp4 = Object.assign(row, {})
       this.getSeeList4()
       this.getSeeList4()
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['updateTemp4'].validate(valid => {
       this.$refs['updateTemp4'].validate(valid => {
         if (valid) {
         if (valid) {
           // for (let i = 0; i < this.listUpdate4.length; i++) {
           // for (let i = 0; i < this.listUpdate4.length; i++) {

+ 48 - 18
src/views/custom/receive/index.vue

@@ -22,9 +22,9 @@
         <el-option v-for="item in applystatueList" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in applystatueList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-if="isReceiveAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isReceiveAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button v-if="isReceiveExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
         <el-button v-if="isReceiveExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
           <el-radio-button label="全部" />
           <el-radio-button label="全部" />
@@ -63,9 +63,9 @@
       <el-table-column label="单据状态" min-width="90px" align="center" :formatter="applystatue" />
       <el-table-column label="单据状态" min-width="90px" align="center" :formatter="applystatue" />
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isReceiveSee" type="primary" size="mini" style="width:60px" @click="handleSee(row)">查看</el-button>
-          <el-button v-if="isReceiveUpdate && (row.SHStatus == 4 || row.SHStatus == 6 ||row.SHStatus == 8 || row.SHStatus == 10)" type="success" style="display:inline-block;width:60px;" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button v-else type="success" style="display:none;" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button v-if="isReceiveSee" type="primary" size="mini" style="width:60px" @click="form_see(row)">查看</el-button>
+          <el-button v-if="isReceiveUpdate && (row.SHStatus == 4 || row.SHStatus == 6 ||row.SHStatus == 8 || row.SHStatus == 10)" type="success" style="display:inline-block;width:60px;" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button v-else type="success" style="display:none;" size="mini" @click="form_edit(row)">编辑</el-button>
           <!-- 部门审核 -->
           <!-- 部门审核 -->
           <el-button v-if="isContractExamineBM && row.SHStatus == 2 && (row.departmentId == getdataListParm.parammaps.logindeptId || depids.filter(function (item) { return item == row.departmentId; }).length != 0)" type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine(row)">审核1</el-button>
           <el-button v-if="isContractExamineBM && row.SHStatus == 2 && (row.departmentId == getdataListParm.parammaps.logindeptId || depids.filter(function (item) { return item == row.departmentId; }).length != 0)" type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine(row)">审核1</el-button>
           <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine(row)">审核1</el-button>
           <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine(row)">审核1</el-button>
@@ -82,8 +82,8 @@
           <el-button v-if="isContractExamineCZ && row.SHStatus == 7" type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine4(row)">审核4</el-button>
           <el-button v-if="isContractExamineCZ && row.SHStatus == 7" type="success" style="display:inline-block;width:60px;" size="mini" @click="handleExamine4(row)">审核4</el-button>
           <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine4(row)">审核4</el-button>
           <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine4(row)">审核4</el-button>
           <!-- 删除 -->
           <!-- 删除 -->
-          <el-button v-if="isReceiveDelete && (row.SHStatus == 4 || row.SHStatus == 6 ||row.SHStatus == 8 || row.SHStatus == 10)" style="display:inline-block;width:60px;" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-          <el-button v-if="row.statue === 1 && isReceiveDelete" style="display:none" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button v-if="isReceiveDelete && (row.SHStatus == 4 || row.SHStatus == 6 ||row.SHStatus == 8 || row.SHStatus == 10)" style="display:inline-block;width:60px;" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+          <el-button v-if="row.statue === 1 && isReceiveDelete" style="display:none" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
           <!-- 关单 -->
           <!-- 关单 -->
           <el-button v-if="isReceiveClose && (row.SHStatus == 9 && row.statue < 2)" style="display:inline-block;width:60px;" type="danger" size="mini" @click="handleCustomsDeclaration(row)">关单</el-button>
           <el-button v-if="isReceiveClose && (row.SHStatus == 9 && row.statue < 2)" style="display:inline-block;width:60px;" type="danger" size="mini" @click="handleCustomsDeclaration(row)">关单</el-button>
           <el-button v-else style="display:none" type="danger" size="mini" @click="handleCustomsDeclaration(row)">关单</el-button>
           <el-button v-else style="display:none" type="danger" size="mini" @click="handleCustomsDeclaration(row)">关单</el-button>
@@ -281,7 +281,7 @@
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -635,6 +635,36 @@ export default {
       },
       },
       depids: []
       depids: []
     }
     }
+  },
+
+  watch: {
+ 
+    listAdd: {
+      deep: true,
+      handler: function (item) {
+          
+
+     
+
+          this.listAdd.forEach(function(i){
+
+            if(parseInt(i.amount) > parseFloat(i.reportery)){
+              i.amount = i.reportery
+            }
+            
+          })
+ 
+
+
+          
+
+         
+      }
+    },
+
+
+    
+ 
   },
   },
 
 
   created() {
   created() {
@@ -847,7 +877,7 @@ export default {
         return '已关闭'
         return '已关闭'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
@@ -865,7 +895,7 @@ export default {
         this.isStatueReason = false
         this.isStatueReason = false
       }
       }
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.TotalAmount = 0
       this.TotalAmount = 0
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       if (row.applyType === '0') {
       if (row.applyType === '0') {
@@ -1016,7 +1046,7 @@ export default {
       this.createTemp.applyCode = ''
       this.createTemp.applyCode = ''
       this.listAdd = []
       this.listAdd = []
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.edit = 1
       this.edit = 1
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
@@ -1141,7 +1171,7 @@ export default {
       }
       }
       this.TotalAmount = this.TotalAmount.toFixed(2)
       this.TotalAmount = this.TotalAmount.toFixed(2)
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1155,16 +1185,16 @@ export default {
                 console.log('新增领用单号', response.data.list[0].orderCode)
                 console.log('新增领用单号', response.data.list[0].orderCode)
                 this.createTemp.applyCode = response.data.list[0].orderCode
                 this.createTemp.applyCode = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         var rulesAmount = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/
         var rulesAmount = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/
         if (this.createTemp.applyType === 0) {
         if (this.createTemp.applyType === 0) {
@@ -1322,7 +1352,7 @@ export default {
     changeDepart(item) {
     changeDepart(item) {
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       console.log('点击了删除')
       console.log('点击了删除')
       MessageBox.confirm('确认删除此条信息?', {
       MessageBox.confirm('确认删除此条信息?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
@@ -1601,7 +1631,7 @@ export default {
       })
       })
     },
     },
 
 
-    handleUpdate(row) {
+    form_edit(row) {
       console.log('点击了编辑')
       console.log('点击了编辑')
       this.edit = 0
       this.edit = 0
       this.getDepartParam.parammaps.pastureId = row.pastureId
       this.getDepartParam.parammaps.pastureId = row.pastureId
@@ -1618,7 +1648,7 @@ export default {
       this.getdataListSee.parammaps.id = row.id
       this.getdataListSee.parammaps.id = row.id
       this.getSeeList()
       this.getSeeList()
     },
     },
-    updateData() {
+    edit_dialog_save() {
       console.log('点击了编辑')
       console.log('点击了编辑')
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         var rulesAmount = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/
         var rulesAmount = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/

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

@@ -49,7 +49,7 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <div>
       <div>
         <el-button
         <el-button
@@ -80,7 +80,7 @@
         <el-button
         <el-button
           style="position: absolute;"
           style="position: absolute;"
           type="danger"
           type="danger"
-          @click="handleDelete(selection)"
+          @click="form_delete(selection)"
         >批量删除
         >批量删除
         </el-button>
         </el-button>
       </div>
       </div>
@@ -530,7 +530,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilterImportInfo() {
+    form_searchImportInfo() {
       this.listLoadingImportInfo = true
       this.listLoadingImportInfo = true
       this.getListImportInfo()
       this.getListImportInfo()
     },
     },
@@ -545,7 +545,7 @@ export default {
         this.getDictByName = response.data.getDictByName.list
         this.getDictByName = response.data.getDictByName.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParmImportInfo.offset = 1
       this.getdataListParmImportInfo.offset = 1
       this.getListImportInfo()
       this.getListImportInfo()
@@ -558,7 +558,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.list2 = []
       this.list2 = []
       this.storage.inputDatetime = parseTime(new Date(), '{y}-{m}-{d}')
       this.storage.inputDatetime = parseTime(new Date(), '{y}-{m}-{d}')
       this.storage.typeName = ''
       this.storage.typeName = ''
@@ -573,7 +573,7 @@ export default {
       this.selection = val
       this.selection = val
     },
     },
     // 删除
     // 删除
-    handleDelete(selection) {
+    form_delete(selection) {
       // console.log('selection', selection)
       // console.log('selection', selection)
       this.parammapsId = []
       this.parammapsId = []
       for (var i = 0; i < selection.length; i++) {
       for (var i = 0; i < selection.length; i++) {

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

@@ -14,7 +14,7 @@
         <el-option v-for="item in findAllStatus" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in findAllStatus" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
     </div>
     </div>
     <el-table
     <el-table
       :key="tableKey"
       :key="tableKey"
@@ -101,7 +101,7 @@
       <el-table-column label="处理日期" sortable prop="handleDate" min-width="90px" align="center" />
       <el-table-column label="处理日期" sortable prop="handleDate" min-width="90px" align="center" />
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <el-button v-if="row.statue == 0" type="success" size="mini" @click="handleDestruction(row)">处理</el-button>
           <el-button v-if="row.statue == 0" type="success" size="mini" @click="handleDestruction(row)">处理</el-button>
           <!-- <el-button v-if="isOld" type="success" size="mini" @click="handleDestruction(row)">销毁/卖掉</el-button> -->
           <!-- <el-button v-if="isOld" type="success" size="mini" @click="handleDestruction(row)">销毁/卖掉</el-button> -->
         </template>
         </template>
@@ -179,7 +179,7 @@
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
         <el-button
         <el-button
           type="primary"
           type="primary"
-          @click="updateDataDestruction()"
+          @click="edit_dialog_saveDestruction()"
         >确认</el-button>
         >确认</el-button>
         <el-button @click="dialogFormVisibleDestruction = false">关闭</el-button>
         <el-button @click="dialogFormVisibleDestruction = false">关闭</el-button>
       </div>
       </div>
@@ -472,7 +472,7 @@ export default {
         this.getDictByName = response.data.getDictByName.list
         this.getDictByName = response.data.getDictByName.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -484,14 +484,14 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         // 格式化日期
         // 格式化日期
         inputDatetime: parseTime(new Date(), '{y}-{m}-{d}')
         inputDatetime: parseTime(new Date(), '{y}-{m}-{d}')
       }
       }
     },
     },
 
 
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.rowSeeData = Object.assign({}, row)
       this.rowSeeData = Object.assign({}, row)
       this.dialogFormVisibleCard = true
       this.dialogFormVisibleCard = true
@@ -515,7 +515,7 @@ export default {
       //   })
       //   })
       // }
       // }
     },
     },
-    updateDataDestruction() {
+    edit_dialog_saveDestruction() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           console.log(this.temp)
           console.log(this.temp)

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

@@ -15,9 +15,9 @@
           <el-select v-model="getdataListParm.parammaps.easStatus" style="width: 150px;" clearable placeholder="EAS同步状态" class="filter-item">
           <el-select v-model="getdataListParm.parammaps.easStatus" style="width: 150px;" clearable placeholder="EAS同步状态" class="filter-item">
             <el-option v-for="item in easStatus.easStatusList" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in easStatus.easStatusList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
-          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isRetreatAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isRetreatAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
             <el-button v-if="isEasSynchronization" class="filter-item" type="primary" style="float: right;" @click="handleEAS">EAS同步</el-button>
             <el-button v-if="isEasSynchronization" class="filter-item" type="primary" style="float: right;" @click="handleEAS">EAS同步</el-button>
 
 
             <el-button   class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-upload2" @click="sapUpload">SAP上传</el-button>
             <el-button   class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-upload2" @click="sapUpload">SAP上传</el-button>
@@ -85,7 +85,7 @@
             </el-table-column>
             </el-table-column>
           <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button v-if="isRetreatSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+              <el-button v-if="isRetreatSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
               <el-button v-if="isRetreatDelate" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
               <el-button v-if="isRetreatDelate" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
@@ -104,7 +104,7 @@
             <el-option v-for="item in findAllProvider" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in findAllProvider" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter2">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search2">搜索</el-button>
           <div>
           <div>
             <el-button v-if="isRetreatExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
             <el-button v-if="isRetreatExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           </div>
           </div>
@@ -409,7 +409,7 @@
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -870,7 +870,7 @@ export default {
         return '未通过'
         return '未通过'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
         this.getdataListParm.parammaps.inputDatetime = ''
         this.getdataListParm.parammaps.inputDatetime = ''
@@ -909,7 +909,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter2() {
+    form_search2() {
       this.listLoading2 = true
       this.listLoading2 = true
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
         this.getdataListParm2.parammaps.inputDatetime = ''
         this.getdataListParm2.parammaps.inputDatetime = ''
@@ -929,7 +929,7 @@ export default {
       this.TotalAmount = 0
       this.TotalAmount = 0
       this.createTemp.id = ''
       this.createTemp.id = ''
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -1136,7 +1136,7 @@ export default {
         this.TotalAmount = parseFloat((this.TotalAmount).toFixed(2))
         this.TotalAmount = parseFloat((this.TotalAmount).toFixed(2))
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1330,7 +1330,7 @@ export default {
         })
         })
     },
     },
     // 查看
     // 查看
-    handleSee(row) {
+    form_see(row) {
       this.dialogStatusSee = 'see'
       this.dialogStatusSee = 'see'
       this.dialogFormVisibleSee = true
       this.dialogFormVisibleSee = true
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
@@ -1363,7 +1363,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true

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

@@ -19,9 +19,9 @@
             <el-option v-for="item in easStatus.easStatusList" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in easStatus.easStatusList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
           <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isReturngoodsAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isReturngoodsAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
             <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
             <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
               <el-radio-button label="全部" />
               <el-radio-button label="全部" />
               <el-badge :value="pending.total" class="item">
               <el-badge :value="pending.total" class="item">
@@ -91,9 +91,9 @@
             </el-table-column>
             </el-table-column>
           <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button v-if="isReturngoodsSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-              <el-button v-if="isReturngoodsUpdate && (row.statue == 4 || row.statue == 6)" type="success" style="display:inline-block" size="mini" @click="handleUpdate(row)">编辑</el-button>
-              <el-button v-else type="success" style="display:none" size="mini" @click="handleUpdate(row)">编辑</el-button>
+              <el-button v-if="isReturngoodsSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+              <el-button v-if="isReturngoodsUpdate && (row.statue == 4 || row.statue == 6)" type="success" style="display:inline-block" size="mini" @click="form_edit(row)">编辑</el-button>
+              <el-button v-else type="success" style="display:none" size="mini" @click="form_edit(row)">编辑</el-button>
 
 
               <!-- 主管审核 -->
               <!-- 主管审核 -->
               <el-button v-if="isReturngoodsExamineZG && row.statue == 2" type="success" style="display:inline-block" size="mini" @click="handleExamine(row)">审核1</el-button>
               <el-button v-if="isReturngoodsExamineZG && row.statue == 2" type="success" style="display:inline-block" size="mini" @click="handleExamine(row)">审核1</el-button>
@@ -101,8 +101,8 @@
               <!-- 采购审核 -->
               <!-- 采购审核 -->
               <el-button v-if="isReturngoodsExamineCG && row.statue == 3" type="success" style="display:inline-block" size="mini" @click="handleExamine2(row)">审核2</el-button>
               <el-button v-if="isReturngoodsExamineCG && row.statue == 3" type="success" style="display:inline-block" size="mini" @click="handleExamine2(row)">审核2</el-button>
               <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine2(row)">审核2</el-button>
               <el-button v-else type="success" style="display:none" size="mini" @click="handleExamine2(row)">审核2</el-button>
-              <el-button v-if="isReturngoodsDelete && (row.statue == 4 || row.statue == 6)" style="display:inline-block" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-              <el-button v-else type="danger" style="display:none" size="mini" @click="handleDelete(row)">删除</el-button>
+              <el-button v-if="isReturngoodsDelete && (row.statue == 4 || row.statue == 6)" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+              <el-button v-else type="danger" style="display:none" size="mini" @click="form_delete(row)">删除</el-button>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
@@ -120,7 +120,7 @@
             <el-option v-for="item in findAllProvider" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in findAllProvider" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter2">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search2">搜索</el-button>
           <div>
           <div>
             <el-button v-if="isReturngoodsExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
             <el-button v-if="isReturngoodsExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           </div>
           </div>
@@ -379,7 +379,7 @@
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -976,7 +976,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter2() {
+    form_search2() {
       this.listLoading2 = true
       this.listLoading2 = true
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
         this.getdataListParm2.parammaps.inputDatetime = ''
         this.getdataListParm2.parammaps.inputDatetime = ''
@@ -1042,7 +1042,7 @@ export default {
         return '已通过'
         return '已通过'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
         this.getdataListParm.parammaps.inputDatetime = ''
         this.getdataListParm.parammaps.inputDatetime = ''
@@ -1154,7 +1154,7 @@ export default {
     },
     },
 
 
 
 
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.createTemp.useForm = ''
       this.createTemp.useForm = ''
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
@@ -1281,7 +1281,7 @@ export default {
       }
       }
       this.TotalAmount = parseFloat((this.TotalAmount).toFixed(2))
       this.TotalAmount = parseFloat((this.TotalAmount).toFixed(2))
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1296,16 +1296,16 @@ export default {
                 console.log('退库单号', response.data.list[0].orderCode)
                 console.log('退库单号', response.data.list[0].orderCode)
                 this.createTemp.useForm = response.data.list[0].orderCode
                 this.createTemp.useForm = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         for (var j = 0; j < this.listAdd.length; j++) {
         for (var j = 0; j < this.listAdd.length; j++) {
           console.log(this.listAdd[j].refundNumber)
           console.log(this.listAdd[j].refundNumber)
@@ -1425,7 +1425,7 @@ export default {
       })
       })
     },
     },
     // 查看
     // 查看
-    handleSee(row) {
+    form_see(row) {
       this.dialogStatusSee = 'see'
       this.dialogStatusSee = 'see'
       this.dialogFormVisibleSee = true
       this.dialogFormVisibleSee = true
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
@@ -1475,7 +1475,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       row.createTime = row.createTime1
       row.createTime = row.createTime1
       this.createTemp = Object.assign({}, row) // copy obj
       this.createTemp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -1485,7 +1485,7 @@ export default {
       this.getdataListSee.parammaps.bigId = this.createTemp.id
       this.getdataListSee.parammaps.bigId = this.createTemp.id
       this.getSeeList()
       this.getSeeList()
     },
     },
-    updateData() {
+    edit_dialog_save() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         for (var j = 0; j < this.listAdd.length; j++) {
         for (var j = 0; j < this.listAdd.length; j++) {
           console.log(this.listAdd[j].refundNumber)
           console.log(this.listAdd[j].refundNumber)
@@ -1613,7 +1613,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       console.log('点击了删除')
       console.log('点击了删除')
       MessageBox.confirm('确认删除此条信息?', {
       MessageBox.confirm('确认删除此条信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',

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

@@ -10,7 +10,7 @@
         :picker-options="pickerOptions1" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
         :picker-options="pickerOptions1" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
         style="top:-3px" />
         style="top:-3px" />
       <el-button v-if="isPraseTime" v-waves class="filter-item" type="primary" icon="el-icon-search"
       <el-button v-if="isPraseTime" v-waves class="filter-item" type="primary" icon="el-icon-search"
-        @click="handleFilter">搜索</el-button>
+        @click="form_search">搜索</el-button>
       <el-select v-if="isType" v-model="getDeptListParm.parammaps.type" class="filter-item" style="width: 120px;"
       <el-select v-if="isType" v-model="getDeptListParm.parammaps.type" class="filter-item" style="width: 120px;"
         @change="changeType">
         @change="changeType">
         <el-option v-for="item in types" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in types" :key="item.id" :label="item.name" :value="item.id" />
@@ -197,7 +197,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter () {
+    form_search () {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()

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

@@ -18,9 +18,9 @@
           <el-select v-model="getdataListParm.parammaps.easStatus" style="width: 150px;" clearable placeholder="EAS同步状态" class="filter-item">
           <el-select v-model="getdataListParm.parammaps.easStatus" style="width: 150px;" clearable placeholder="EAS同步状态" class="filter-item">
             <el-option v-for="item in easStatus.easStatusList" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in easStatus.easStatusList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
-          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
           <div>
-            <el-button v-if="isStorageAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+            <el-button v-if="isStorageAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
             <el-button v-if="isStorageTemplate" v-waves class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp"> 模板 </el-button>
             <el-button v-if="isStorageTemplate" v-waves class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp"> 模板 </el-button>
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
               <el-button v-if="isStorageImport" v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
               <el-button v-if="isStorageImport" v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
@@ -100,8 +100,8 @@
             </el-table-column>
             </el-table-column>
           <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
           <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
             <template slot-scope="{row}">
-              <el-button v-if="isStorageSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-              <!-- <el-button v-if="isStorageSee" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button> -->
+              <el-button v-if="isStorageSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+              <!-- <el-button v-if="isStorageSee" type="success" size="mini" @click="form_edit(row)">编辑</el-button> -->
               <el-button v-if="isStorageDelete && row.laidType !== 2" style="display:inline-block" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
               <el-button v-if="isStorageDelete && row.laidType !== 2" style="display:inline-block" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
               <el-button v-else style="display:none" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
               <el-button v-else style="display:none" type="danger" size="mini" @click="handleDelate(row)">删除</el-button>
             </template>
             </template>
@@ -121,7 +121,7 @@
             <el-option v-for="item in findAllProvider2" :key="item.id" :label="item.name" :value="item.id" />
             <el-option v-for="item in findAllProvider2" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           </el-select>
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
           <el-date-picker ref="inputDatetime2" v-model="getdataListParm2.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter2">搜索</el-button>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search2">搜索</el-button>
         </div>
         </div>
         <el-table
         <el-table
           :key="tableKey2"
           :key="tableKey2"
@@ -471,7 +471,7 @@
           style="width: 800px; margin-left:50px;"
           style="width: 800px; margin-left:50px;"
         />
         />
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -1106,7 +1106,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter2() {
+    form_search2() {
       this.listLoading2 = true
       this.listLoading2 = true
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
       if (this.getdataListParm2.parammaps.inputDatetime === null) {
         this.getdataListParm2.parammaps.inputDatetime = ''
         this.getdataListParm2.parammaps.inputDatetime = ''
@@ -1124,7 +1124,7 @@ export default {
         return '调拨入库'
         return '调拨入库'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
@@ -1134,7 +1134,7 @@ export default {
       this.getList()
       this.getList()
     },
     },
     // 查看详情
     // 查看详情
-    handleSee(row) {
+    form_see(row) {
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       this.TotalAmount = 0
       this.TotalAmount = 0
       console.log('查看上方数据(从table读取)', this.seeTemp)
       console.log('查看上方数据(从table读取)', this.seeTemp)
@@ -1204,7 +1204,7 @@ export default {
       this.storage.laidCode = ''
       this.storage.laidCode = ''
       this.TotalAmount = 0
       this.TotalAmount = 0
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.storage.laidCode = ''
       this.storage.laidCode = ''
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
@@ -1516,7 +1516,7 @@ export default {
         this.$message({ type: 'warning', message: '当前无备件需要清空', duration: 2000 })
         this.$message({ type: 'warning', message: '当前无备件需要清空', duration: 2000 })
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1529,16 +1529,16 @@ export default {
                 console.log('入库单号', response.data.list[0].orderCode)
                 console.log('入库单号', response.data.list[0].orderCode)
                 this.storage.laidCode = response.data.list[0].orderCode
                 this.storage.laidCode = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         if (this.storage.laidType === 0) {
         if (this.storage.laidType === 0) {
           // 采购
           // 采购
@@ -1874,7 +1874,7 @@ export default {
         return false
         return false
       }
       }
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.storage = Object.assign({}, row) // copy obj
       this.storage = Object.assign({}, row) // copy obj
       this.defaultCheckedKeys = [this.temp.eqClassId]
       this.defaultCheckedKeys = [this.temp.eqClassId]
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
@@ -1883,7 +1883,7 @@ export default {
         // this.$refs['temp'].clearValidate()
         // this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false

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

@@ -20,10 +20,10 @@
         <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
       </el-select> -->
       </el-select> -->
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
 
 
-        <el-button v-if="isSubscribeAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isSubscribeAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-button v-if="isSubscribeExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
         <el-button v-if="isSubscribeExport" v-waves class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
           <el-radio-button label="全部" />
           <el-radio-button label="全部" />
@@ -79,9 +79,9 @@
       <el-table-column label="审核状态" min-width="80px" align="center" :formatter="statue" />
       <el-table-column label="审核状态" min-width="80px" align="center" :formatter="statue" />
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isSubscribeSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-          <el-button v-if="row.statue == 4||row.statue == 6||row.statue == 8" style="display:inline-block" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button v-else style="display:none" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
+          <el-button v-if="isSubscribeSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
+          <el-button v-if="row.statue == 4||row.statue == 6||row.statue == 8" style="display:inline-block" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button v-else style="display:none" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <!-- 库管 -->
           <!-- 库管 -->
           <el-button v-if="isSubscribeExamineKG && row.statue == 2" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核1</el-button>
           <el-button v-if="isSubscribeExamineKG && row.statue == 2" style="display:inline-block" type="success" size="mini" @click="handleExamine(row)">审核1</el-button>
           <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核1</el-button>
           <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine(row)">审核1</el-button>
@@ -91,8 +91,8 @@
           <!-- 采购 -->
           <!-- 采购 -->
           <el-button v-if="isSubscribeExamineCG && row.statue == 5" style="display:inline-block" type="success" size="mini" @click="handleExamine3(row)">审核3</el-button>
           <el-button v-if="isSubscribeExamineCG && row.statue == 5" style="display:inline-block" type="success" size="mini" @click="handleExamine3(row)">审核3</el-button>
           <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine3(row)">审核3</el-button>
           <el-button v-else style="display:none" type="success" size="mini" @click="handleExamine3(row)">审核3</el-button>
-          <el-button v-if="isSubscribeDelete && (row.statue == 4||row.statue == 6||row.statue == 8)" style="display:inline-block" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-          <el-button v-else style="display:none" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button v-if="isSubscribeDelete && (row.statue == 4||row.statue == 6||row.statue == 8)" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+          <el-button v-else style="display:none" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -269,7 +269,7 @@
           </el-table-column>
           </el-table-column>
         </el-table>
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -796,7 +796,7 @@ export default {
         return '未通过'
         return '未通过'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
         this.getdataListParm.parammaps.inputDatetime = ''
         this.getdataListParm.parammaps.inputDatetime = ''
@@ -815,7 +815,7 @@ export default {
       this.createTemp.providerId = ''
       this.createTemp.providerId = ''
       this.listAdd = []
       this.listAdd = []
     },
     },
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.edit = 1
       this.edit = 1
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
       this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
@@ -976,7 +976,7 @@ export default {
         this.$forceUpdate()
         this.$forceUpdate()
       }
       }
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -990,16 +990,16 @@ export default {
                 console.log('新增申购单号', response.data.list[0].orderCode)
                 console.log('新增申购单号', response.data.list[0].orderCode)
                 this.createTemp.orderNumber = response.data.list[0].orderCode
                 this.createTemp.orderNumber = response.data.list[0].orderCode
                 this.$forceUpdate()
                 this.$forceUpdate()
-                this.createDataSave()
+                this.add_dialog_saveSave()
               })
               })
             })
             })
           } else {
           } else {
-            this.createDataSave()
+            this.add_dialog_saveSave()
           }
           }
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         for (var j = 0; j < this.listAdd.length; j++) {
         for (var j = 0; j < this.listAdd.length; j++) {
           console.log(this.listAdd[j].amount)
           console.log(this.listAdd[j].amount)
@@ -1114,7 +1114,7 @@ export default {
       })
       })
     },
     },
     // 查看
     // 查看
-    handleSee(row) {
+    form_see(row) {
       this.dialogStatus = 'see'
       this.dialogStatus = 'see'
       this.dialogFormVisibleSee = true
       this.dialogFormVisibleSee = true
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
@@ -1181,7 +1181,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.edit = 0
       this.edit = 0
       this.getDepartParam.parammaps.pastureId = row.pastureId
       this.getDepartParam.parammaps.pastureId = row.pastureId
       this.getCreateDepartDownList()
       this.getCreateDepartDownList()
@@ -1198,18 +1198,18 @@ export default {
       this.getdataListSee.parammaps.id = this.createTemp.id
       this.getdataListSee.parammaps.id = this.createTemp.id
       this.getSeeList()
       this.getSeeList()
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
       }, 1000)
       }, 1000)
       this.$refs['createTemp'].validate(valid => {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
         if (valid) {
-          this.updateDataSave()
+          this.edit_dialog_saveSave()
         }
         }
       })
       })
     },
     },
-    updateDataSave() {
+    edit_dialog_saveSave() {
       if (this.listAdd.length !== 0) {
       if (this.listAdd.length !== 0) {
         for (var j = 0; j < this.listAdd.length; j++) {
         for (var j = 0; j < this.listAdd.length; j++) {
           console.log(this.listAdd[j].amount)
           console.log(this.listAdd[j].amount)
@@ -1376,7 +1376,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       console.log('点击了删除')
       console.log('点击了删除')
       MessageBox.confirm('确认删除此条信息?', {
       MessageBox.confirm('确认删除此条信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',

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

@@ -12,9 +12,9 @@
       <el-select v-model="table1.getdataListParm.parammaps.hasTicket" style="width: 180px;" clearable placeholder="是否已开票" class="filter-item" v-if="table1.getdataListParm.parammaps.writeoffType == '备件入库' || table1.getdataListParm.parammaps.writeoffType == '备件退货'">
       <el-select v-model="table1.getdataListParm.parammaps.hasTicket" style="width: 180px;" clearable placeholder="是否已开票" class="filter-item" v-if="table1.getdataListParm.parammaps.writeoffType == '备件入库' || table1.getdataListParm.parammaps.writeoffType == '备件退货'">
         <el-option v-for="item in invoicedReturnDocList" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in invoicedReturnDocList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-if="isWriteoffAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isWriteoffAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       </div>
       </div>
     </div>
     </div>
     <el-table
     <el-table
@@ -50,7 +50,7 @@
       <el-table-column label="设备管理平台行号" min-width="150px" align="center" prop="rowNumber" />
       <el-table-column label="设备管理平台行号" min-width="150px" align="center" prop="rowNumber" />
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isWriteoffSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button v-if="isWriteoffSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <!-- <el-button v-if="isWriteoffDel" type="danger" size="mini" @click="handleDelate(row)">删除</el-button> -->
           <!-- <el-button v-if="isWriteoffDel" type="danger" size="mini" @click="handleDelate(row)">删除</el-button> -->
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -128,7 +128,7 @@
           <el-table-column label="总价" prop="totalPrice" align="center" min-width="90" />
           <el-table-column label="总价" prop="totalPrice" align="center" min-width="90" />
         </el-table>
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" v-if="dialogStatus=='create'" :disabled="isokDisable" @click="createData()">保存并关闭</el-button>
+          <el-button type="primary" v-if="dialogStatus=='create'" :disabled="isokDisable" @click="add_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -263,13 +263,13 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.table1.listLoading = true
       this.table1.listLoading = true
       this.table1.getdataListParm.offset = 1
       this.table1.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleCreate() {
+    form_add() {
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.create.temp = {'materialCode':'','proofYear':'','chargeDate':'','orderNumber':'','hasTicket':'','orderNumberId':'','NumberType':'','rowsNumber':[]}
       this.create.temp = {'materialCode':'','proofYear':'','chargeDate':'','orderNumber':'','hasTicket':'','orderNumberId':'','NumberType':'','rowsNumber':[]}
@@ -318,7 +318,7 @@ export default {
       })
       })
     },
     },
    
    
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -385,7 +385,7 @@ export default {
     },
     },
 
 
     // 查看
     // 查看
-    handleSee(row) {
+    form_see(row) {
       this.dialogStatus = 'see'
       this.dialogStatus = 'see'
       
       
       this.create.temp = Object.assign({}, row)
       this.create.temp = Object.assign({}, row)

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

@@ -12,9 +12,9 @@
       <el-select v-model="table1.getdataListParm.parammaps.hasTicket" style="width: 180px;" clearable placeholder="是否已开票" class="filter-item" v-if="table1.getdataListParm.parammaps.writeoffType == '备件入库' || table1.getdataListParm.parammaps.writeoffType == '备件退货'">
       <el-select v-model="table1.getdataListParm.parammaps.hasTicket" style="width: 180px;" clearable placeholder="是否已开票" class="filter-item" v-if="table1.getdataListParm.parammaps.writeoffType == '备件入库' || table1.getdataListParm.parammaps.writeoffType == '备件退货'">
         <el-option v-for="item in invoicedReturnDocList" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in invoicedReturnDocList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-if="isWriteoffAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button v-if="isWriteoffAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
       </div>
       </div>
     </div>
     </div>
     <el-table
     <el-table
@@ -50,7 +50,7 @@
       <el-table-column label="设备管理平台行号" min-width="150px" align="center" prop="rowNumber" />
       <el-table-column label="设备管理平台行号" min-width="150px" align="center" prop="rowNumber" />
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isWriteoffSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button v-if="isWriteoffSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <!-- <el-button v-if="isWriteoffDel" type="danger" size="mini" @click="handleDelate(row)">删除</el-button> -->
           <!-- <el-button v-if="isWriteoffDel" type="danger" size="mini" @click="handleDelate(row)">删除</el-button> -->
         </template>
         </template>
       </el-table-column>
       </el-table-column>
@@ -128,7 +128,7 @@
           <el-table-column label="总价" prop="totalPrice" align="center" min-width="90" />
           <el-table-column label="总价" prop="totalPrice" align="center" min-width="90" />
         </el-table>
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" v-if="dialogStatus=='create'" :disabled="isokDisable" @click="createData()">保存并关闭</el-button>
+          <el-button type="primary" v-if="dialogStatus=='create'" :disabled="isokDisable" @click="add_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false;getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -263,13 +263,13 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.table1.listLoading = true
       this.table1.listLoading = true
       this.table1.getdataListParm.offset = 1
       this.table1.getdataListParm.offset = 1
       this.getList()
       this.getList()
     },
     },
-    handleCreate() {
+    form_add() {
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.create.temp = {'materialCode':'','proofYear':'','chargeDate':'','orderNumber':'','hasTicket':'','orderNumberId':'','NumberType':'','rowsNumber':[]}
       this.create.temp = {'materialCode':'','proofYear':'','chargeDate':'','orderNumber':'','hasTicket':'','orderNumberId':'','NumberType':'','rowsNumber':[]}
@@ -324,7 +324,7 @@ export default {
       }
       }
       console.log(this.create.temp.rowsNumber)
       console.log(this.create.temp.rowsNumber)
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -379,7 +379,7 @@ export default {
     },
     },
 
 
     // 查看
     // 查看
-    handleSee(row) {
+    form_see(row) {
       this.dialogStatus = 'see'
       this.dialogStatus = 'see'
       
       
       this.create.temp = Object.assign({}, row)
       this.create.temp = Object.assign({}, row)

+ 8 - 8
src/views/dashboard/editor/index.vue

@@ -53,7 +53,7 @@
               <div class="Title">设备状态统计</div>
               <div class="Title">设备状态统计</div>
               <div id="row2Chart2" style="width: 100%;height:190px;" />
               <div id="row2Chart2" style="width: 100%;height:190px;" />
               <div class="Indexbutton">
               <div class="Indexbutton">
-                <a @click="handleSeeDetails('row2Chart2')">查看详情</a>
+                <a @click="form_seeDetails('row2Chart2')">查看详情</a>
               </div>
               </div>
             </dv-border-box-8>
             </dv-border-box-8>
           </el-col>
           </el-col>
@@ -82,7 +82,7 @@
                 </el-table>
                 </el-table>
               </div>
               </div>
               <div class="Indexbutton">
               <div class="Indexbutton">
-                <a @click="handleSeeDetails('row2Chart3')">查看详情</a>
+                <a @click="form_seeDetails('row2Chart3')">查看详情</a>
               </div>
               </div>
             </dv-border-box-8>
             </dv-border-box-8>
           </el-col>
           </el-col>
@@ -91,7 +91,7 @@
               <div class="Title">资产运转率</div>
               <div class="Title">资产运转率</div>
               <div id="row2Chart4" style="width: 100%;height:190px;" />
               <div id="row2Chart4" style="width: 100%;height:190px;" />
               <div class="Indexbutton">
               <div class="Indexbutton">
-                <a @click="handleSeeDetails('row2Chart4')">查看详情</a>
+                <a @click="form_seeDetails('row2Chart4')">查看详情</a>
               </div>
               </div>
             </dv-border-box-8>
             </dv-border-box-8>
           </el-col>
           </el-col>
@@ -120,7 +120,7 @@
                       </div>
                       </div>
                     </div>
                     </div>
                     <div class="Indexbutton">
                     <div class="Indexbutton">
-                      <a @click="handleSeeDetails('row3Chart1')">查看详情</a>
+                      <a @click="form_seeDetails('row3Chart1')">查看详情</a>
                     </div>
                     </div>
                   </el-col>
                   </el-col>
                   <el-col :span="16" style="padding:0 10px 0 0 ;">
                   <el-col :span="16" style="padding:0 10px 0 0 ;">
@@ -147,7 +147,7 @@
                       </div>
                       </div>
                     </div>
                     </div>
                     <div class="Indexbutton">
                     <div class="Indexbutton">
-                      <a @click="handleSeeDetails('row3Chart2')">查看详情</a>
+                      <a @click="form_seeDetails('row3Chart2')">查看详情</a>
                     </div>
                     </div>
                   </el-col>
                   </el-col>
                   <el-col :span="16" style="padding:0 10px 0 0 ;">
                   <el-col :span="16" style="padding:0 10px 0 0 ;">
@@ -174,7 +174,7 @@
                       </div>
                       </div>
                     </div>
                     </div>
                     <div class="Indexbutton">
                     <div class="Indexbutton">
-                      <a @click="handleSeeDetails('row3Chart3')">查看详情</a>
+                      <a @click="form_seeDetails('row3Chart3')">查看详情</a>
                     </div>
                     </div>
                   </el-col>
                   </el-col>
                   <el-col :span="16" style="padding:0 10px 0 0 ;">
                   <el-col :span="16" style="padding:0 10px 0 0 ;">
@@ -201,7 +201,7 @@
                       </div>
                       </div>
                     </div>
                     </div>
                     <div class="Indexbutton">
                     <div class="Indexbutton">
-                      <a @click="handleSeeDetails('row3Chart4')">查看详情</a>
+                      <a @click="form_seeDetails('row3Chart4')">查看详情</a>
                     </div>
                     </div>
                   </el-col>
                   </el-col>
                   <el-col :span="16" style="padding:0 10px 0 0 ;">
                   <el-col :span="16" style="padding:0 10px 0 0 ;">
@@ -367,7 +367,7 @@ export default {
     this.getRow2Chart1()
     this.getRow2Chart1()
   },
   },
   methods: {
   methods: {
-    handleSeeDetails(item) {
+    form_seeDetails(item) {
       if (item == 'row2Chart2') {
       if (item == 'row2Chart2') {
         console.log('设备状态统计')
         console.log('设备状态统计')
         this.$router.push('/report/EquipmentOverview')
         this.$router.push('/report/EquipmentOverview')

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

@@ -42,7 +42,7 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <div>
       <div>
         <el-button
         <el-button
@@ -50,14 +50,14 @@
           style="margin-left: 10px;"
           style="margin-left: 10px;"
           type="primary"
           type="primary"
           icon="el-icon-edit"
           icon="el-icon-edit"
-          @click="handleCreate"
+          @click="form_add"
         >新增</el-button>
         >新增</el-button>
         <el-button
         <el-button
           class="filter-item"
           class="filter-item"
           style="margin-left: 10px;"
           style="margin-left: 10px;"
           type="warning"
           type="warning"
           icon="el-icon-edit"
           icon="el-icon-edit"
-          @click="handleCreate"
+          @click="form_add"
         >导入</el-button>
         >导入</el-button>
       </div>
       </div>
     </div>
     </div>
@@ -136,12 +136,12 @@
           <el-button
           <el-button
             type="success"
             type="success"
             size="mini"
             size="mini"
-            @click="handleUpdate(row)"
+            @click="form_edit(row)"
           >编辑</el-button>
           >编辑</el-button>
           <el-button
           <el-button
             type="danger"
             type="danger"
             size="mini"
             size="mini"
-            @click="handleDelete(row)"
+            @click="form_delete(row)"
           >删除</el-button>
           >删除</el-button>
           <!-- <el-button
           <!-- <el-button
             type="danger"
             type="danger"
@@ -377,9 +377,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button v-if="dialogStatus !='card'" type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button v-if="dialogStatus !='card'" type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -536,7 +536,7 @@ export default {
         this.getDictByName = response.data.getDictByName.list
         this.getDictByName = response.data.getDictByName.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -548,7 +548,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp.inputDatetime = parseTime(new Date(), '{y}-{m}-{d}')
       this.temp.inputDatetime = parseTime(new Date(), '{y}-{m}-{d}')
       this.temp.typeName = ''
       this.temp.typeName = ''
       this.temp.assTypeId = ''
       this.temp.assTypeId = ''
@@ -569,15 +569,15 @@ export default {
       this.temp.yuanzhi = ''
       this.temp.yuanzhi = ''
       this.temp.financeNumber = ''
       this.temp.financeNumber = ''
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertUseElec'
           this.requestParam.name = 'insertUseElec'
@@ -606,7 +606,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -622,7 +622,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateUseElec'
           this.requestParam.name = 'updateUseElec'
@@ -650,7 +650,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('设备名称:' + row.elecName, '确认删除?', {
       MessageBox.confirm('设备名称:' + row.elecName, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -10,10 +10,10 @@
           <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
           <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
         </el-select>
         </el-select>
         <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
         <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+        <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       </div>
       </div>
       <div class="app-btn">
       <div class="app-btn">
-        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">评估</el-button>
+        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">评估</el-button>
         <el-button class="filter-item" type="warning" @click="handleInspectionStandard">检查标准管理</el-button>
         <el-button class="filter-item" type="warning" @click="handleInspectionStandard">检查标准管理</el-button>
       </div>
       </div>
       <el-table
       <el-table
@@ -48,9 +48,9 @@
         <el-table-column label="评估分数" min-width="120px" align="center" sortable prop="scores" />
         <el-table-column label="评估分数" min-width="120px" align="center" sortable prop="scores" />
         <el-table-column label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-            <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-            <el-button type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+            <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
+            <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+            <el-button type="danger" size="mini" @click="form_delete(row)">删除</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -164,9 +164,9 @@
           </el-table>
           </el-table>
         </div>
         </div>
         <div slot="footer" class="dialog-footer" style="bottom:5px">
         <div slot="footer" class="dialog-footer" style="bottom:5px">
-          <!-- <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='assessment'?createDataAdd():updateData()">保存并关闭</el-button> -->
-          <el-button v-if="dialogStatus==='assessment'" type="primary" :disabled="isokDisable" @click="createDataAdd()">保存并关闭</el-button>
-          <el-button v-if="dialogStatus==='update'" type="primary" :disabled="isokDisable" @click="updateData()">保存并关闭</el-button>
+          <!-- <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='assessment'?add_dialog_saveAdd():edit_dialog_save()">保存并关闭</el-button> -->
+          <el-button v-if="dialogStatus==='assessment'" type="primary" :disabled="isokDisable" @click="add_dialog_saveAdd()">保存并关闭</el-button>
+          <el-button v-if="dialogStatus==='update'" type="primary" :disabled="isokDisable" @click="edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisibleAdd = false;">取消并关闭</el-button>
           <el-button @click="dialogFormVisibleAdd = false;">取消并关闭</el-button>
         </div>
         </div>
       </el-dialog>
       </el-dialog>
@@ -265,7 +265,7 @@
         <a class="title2-r" @click="goBack">&lt;返回</a>
         <a class="title2-r" @click="goBack">&lt;返回</a>
       </div>
       </div>
       <div class="app-btn">
       <div class="app-btn">
-        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate2">新增</el-button>
+        <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="form_add2">新增</el-button>
         <el-button class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp2">模板</el-button>
         <el-button class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp2">模板</el-button>
         <el-upload style="display: inline-block;" :headers="headers2" :data="uploadData2" :action="uploadExcelUrl2" :show-file-list="false" :before-upload="beforeImportExcel2" :on-success="handleImportExcelSuccess2">
         <el-upload style="display: inline-block;" :headers="headers2" :data="uploadData2" :action="uploadExcelUrl2" :show-file-list="false" :before-upload="beforeImportExcel2" :on-success="handleImportExcelSuccess2">
           <el-button v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
           <el-button v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
@@ -296,9 +296,9 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
         <el-table-column label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
           <template slot-scope="{row}">
-            <el-button type="success" size="mini" @click="handleSee2(row)">查看</el-button>
-            <el-button type="success" size="mini" @click="handleUpdate2(row)">编辑</el-button>
-            <el-button type="danger" size="mini" @click="handleDelete2(row)">删除</el-button>
+            <el-button type="success" size="mini" @click="form_see2(row)">查看</el-button>
+            <el-button type="success" size="mini" @click="form_edit2(row)">编辑</el-button>
+            <el-button type="danger" size="mini" @click="form_delete2(row)">删除</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
@@ -345,12 +345,12 @@
             </el-table-column>
             </el-table-column>
             <el-table-column v-if="dialogStatus==='update' || dialogStatus==='create'" label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
             <el-table-column v-if="dialogStatus==='update' || dialogStatus==='create'" label="操作" align="center" width="300px" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
               <template slot-scope="{row}">
-                <el-button type="danger" size="mini" @click="handleDelete3(row)">删除</el-button>
+                <el-button type="danger" size="mini" @click="form_delete3(row)">删除</el-button>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>
           <div slot="footer" class="dialog-footer">
           <div slot="footer" class="dialog-footer">
-            <el-button v-if="dialogStatus==='update' || dialogStatus==='create'" type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData2():updateData2()">保存并关闭</el-button>
+            <el-button v-if="dialogStatus==='update' || dialogStatus==='create'" type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save2():edit_dialog_save2()">保存并关闭</el-button>
             <el-button @click="dialogFormVisible = false;getList2();">取消并关闭</el-button>
             <el-button @click="dialogFormVisible = false;getList2();">取消并关闭</el-button>
           </div>
           </div>
         </div>
         </div>
@@ -544,7 +544,7 @@ export default {
         }, 300)
         }, 300)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了搜索')
       console.log('点击了搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
@@ -554,7 +554,7 @@ export default {
       this.getList()
       this.getList()
     },
     },
 
 
-    handleSee(row) {
+    form_see(row) {
       console.log('查看')
       console.log('查看')
       this.seeTemp = Object.assign(row, {})
       this.seeTemp = Object.assign(row, {})
       this.dialogStatus = 'see'
       this.dialogStatus = 'see'
@@ -690,7 +690,7 @@ export default {
         }, 300)
         }, 300)
       })
       })
     },
     },
-    handleCreate() {
+    form_add() {
       console.log('点击了评估')
       console.log('点击了评估')
       this.createTemp.statue = ''
       this.createTemp.statue = ''
       this.createTemp.empId = this.$store.state.user.employeid
       this.createTemp.empId = this.$store.state.user.employeid
@@ -804,7 +804,7 @@ export default {
       }
       }
       this.width = width + 'px'
       this.width = width + 'px'
     },
     },
-    createDataAdd() {
+    add_dialog_saveAdd() {
       console.log('点击了保存')
       console.log('点击了保存')
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
@@ -884,7 +884,7 @@ export default {
         type: 'warning'
         type: 'warning'
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       console.log('编辑', row)
       console.log('编辑', row)
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisibleAdd = true
       this.dialogFormVisibleAdd = true
@@ -946,7 +946,7 @@ export default {
         }, 300)
         }, 300)
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       console.log('点击了编辑保存', this.listAdd)
       console.log('点击了编辑保存', this.listAdd)
       console.log('点击了保存')
       console.log('点击了保存')
       this.isokDisable = true
       this.isokDisable = true
@@ -1018,7 +1018,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       console.log('删除')
       console.log('删除')
       MessageBox.confirm('确认删除?', {
       MessageBox.confirm('确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
@@ -1101,7 +1101,7 @@ export default {
       this.List2 = false
       this.List2 = false
       this.getList()
       this.getList()
     },
     },
-    handleCreate2() {
+    form_add2() {
       console.log('点击了检查标准管理-新增')
       console.log('点击了检查标准管理-新增')
       this.createTemp.statue = ''
       this.createTemp.statue = ''
       this.list3 = []
       this.list3 = []
@@ -1194,7 +1194,7 @@ export default {
       console.log('点击了检查标准管理-新增-添加标准')
       console.log('点击了检查标准管理-新增-添加标准')
       this.list3.push({ 'myid': (new Date()).valueOf(), 'statue': '' })
       this.list3.push({ 'myid': (new Date()).valueOf(), 'statue': '' })
     },
     },
-    handleDelete3(row) {
+    form_delete3(row) {
       console.log(row)
       console.log(row)
       if (row.id !== undefined) {
       if (row.id !== undefined) {
         this.$set(row, 'myid', row.id)
         this.$set(row, 'myid', row.id)
@@ -1216,7 +1216,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createData2() {
+    add_dialog_save2() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1278,7 +1278,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleSee2(row) {
+    form_see2(row) {
       this.list3 = []
       this.list3 = []
       this.createTemp = Object.assign(row, {})
       this.createTemp = Object.assign(row, {})
       this.dialogStatus = 'see'
       this.dialogStatus = 'see'
@@ -1304,7 +1304,7 @@ export default {
         }, 300)
         }, 300)
       })
       })
     },
     },
-    handleUpdate2(row) {
+    form_edit2(row) {
       this.createTemp.statue = ''
       this.createTemp.statue = ''
       this.list3 = []
       this.list3 = []
       this.createTemp = Object.assign(row, {})
       this.createTemp = Object.assign(row, {})
@@ -1313,7 +1313,7 @@ export default {
       this.getdataListParmSee2.parammaps.id = row.id
       this.getdataListParmSee2.parammaps.id = row.id
       this.getListSee2()
       this.getListSee2()
     },
     },
-    updateData2() {
+    edit_dialog_save2() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -1379,7 +1379,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete2(row) {
+    form_delete2(row) {
       console.log('检查标准管理-删除')
       console.log('检查标准管理-删除')
       MessageBox.confirm('确认删除此信息?', {
       MessageBox.confirm('确认删除此信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',

+ 10 - 10
src/views/knowledgeBase/file/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <div class="app-btn">
     <div class="app-btn">
       <div class="btn-l">
       <div class="btn-l">
-        <el-button :disabled="isDisableAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">新增</el-button>
+        <el-button :disabled="isDisableAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
         <el-upload
         <el-upload
           style="display: inline-block;margin-left: 10px;"
           style="display: inline-block;margin-left: 10px;"
           :headers="headers"
           :headers="headers"
@@ -25,11 +25,11 @@
       </div>
       </div>
       <div v-if="isFilter1" class="btn-r">
       <div v-if="isFilter1" class="btn-r">
         <el-input v-model="getdataListAllParm.parammaps.docname" placeholder="文件名称" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListAllParm.parammaps.docname" placeholder="文件名称" style="width: 140px;" class="filter-item" />
-        <el-button v-if="isFilter1" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+        <el-button v-if="isFilter1" class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       </div>
       </div>
       <div v-if="isFilter2" class="btn-r">
       <div v-if="isFilter2" class="btn-r">
         <el-input v-model="getdataListParmDetail.parammaps.docname" placeholder="文件名称" style="width: 140px;" class="filter-item" />
         <el-input v-model="getdataListParmDetail.parammaps.docname" placeholder="文件名称" style="width: 140px;" class="filter-item" />
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter2">搜索</el-button>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="form_search2">搜索</el-button>
       </div>
       </div>
     </div>
     </div>
     <!-- 文件夹列表 -->
     <!-- 文件夹列表 -->
@@ -40,7 +40,7 @@
           <el-checkbox v-model="item.checkeds" name="type" class="contentCard-checkbox" />
           <el-checkbox v-model="item.checkeds" name="type" class="contentCard-checkbox" />
         </div>
         </div>
         <div class="contentCard-title">
         <div class="contentCard-title">
-          <span v-if="item.isDirectName" class="contentCard-title-name" @click="handleUpdate(item)">{{ item.direct }}</span>
+          <span v-if="item.isDirectName" class="contentCard-title-name" @click="form_edit(item)">{{ item.direct }}</span>
           <input v-if="item.isDirectInput" id="direct" v-model="item.direct" class="contentCard-title-input" type="text" @blur="blurName(item)">
           <input v-if="item.isDirectInput" id="direct" v-model="item.direct" class="contentCard-title-input" type="text" @blur="blurName(item)">
         </div>
         </div>
       </div>
       </div>
@@ -112,7 +112,7 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():createData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():add_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getList()">取消并关闭</el-button>
           <el-button @click="dialogFormVisible = false; getList()">取消并关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -247,7 +247,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       // 隐藏文件夹,显示文件
       // 隐藏文件夹,显示文件
       this.fileList = false
       this.fileList = false
       this.detailList = true
       this.detailList = true
@@ -267,7 +267,7 @@ export default {
         }, 100)
         }, 100)
       })
       })
     },
     },
-    handleFilter2() {
+    form_search2() {
       console.log('点击了局部搜索')
       console.log('点击了局部搜索')
       this.getdataListParmDetail.offset = 1
       this.getdataListParmDetail.offset = 1
       this.getListDetail()
       this.getListDetail()
@@ -276,12 +276,12 @@ export default {
       this.createTemp.direct = ''
       this.createTemp.direct = ''
     },
     },
     // 新建文件
     // 新建文件
-    handleCreate() {
+    form_add() {
       this.resetCreateTemp()
       this.resetCreateTemp()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -310,7 +310,7 @@ export default {
       })
       })
     },
     },
     // 点击文件名进行更新
     // 点击文件名进行更新
-    handleUpdate(item) {
+    form_edit(item) {
       console.log('点击标题得到数据', item)
       console.log('点击标题得到数据', item)
       for (var i = 0; i < this.list.length; i++) {
       for (var i = 0; i < this.list.length; i++) {
         if (this.list[i].id === item.id) {
         if (this.list[i].id === item.id) {

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

@@ -17,7 +17,7 @@
         <el-option v-for="item in SHStatues" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in SHStatues" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
           <el-radio-button label="全部" />
           <el-radio-button label="全部" />
@@ -109,7 +109,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" min-width="300" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" min-width="300" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button v-if="isSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <!-- 保养及领用-->
           <!-- 保养及领用-->
           <el-button v-if="(row.SHStatue == 1 || row.SHStatue== 4 || row.SHStatue== 6 || row.SHStatue== 8 ) && row.LYStatue == '未领用' && row.statue !== 0 && isLingYong && row.upkeepPersonId == getdataListParm.parammaps.loginId" type="success" size="mini" style="width:80px;display:inline-block" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
           <el-button v-if="(row.SHStatue == 1 || row.SHStatue== 4 || row.SHStatue== 6 || row.SHStatue== 8 ) && row.LYStatue == '未领用' && row.statue !== 0 && isLingYong && row.upkeepPersonId == getdataListParm.parammaps.loginId" type="success" size="mini" style="width:80px;display:inline-block" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
@@ -1371,7 +1371,7 @@ export default {
         return '已通过'
         return '已通过'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
@@ -1381,7 +1381,7 @@ export default {
       this.getList()
       this.getList()
       this.getPendingList()
       this.getPendingList()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       console.log('查看', this.seeTemp)
       console.log('查看', this.seeTemp)
       // 流程图
       // 流程图

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

@@ -17,7 +17,7 @@
         <el-option v-for="item in SHStatues" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in SHStatues" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
           <el-radio-button label="全部" />
           <el-radio-button label="全部" />
@@ -108,7 +108,7 @@
       <!-- 临时注释 -->
       <!-- 临时注释 -->
       <el-table-column label="操作" align="center" min-width="300" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" min-width="300" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button v-if="isSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <!-- 保养及领用-->
           <!-- 保养及领用-->
           <el-button v-if="(row.SHStatue == 1 || row.SHStatue== 4 || row.SHStatue== 6 || row.SHStatue== 8 ) && row.LYStatue == '未领用' && row.statue !== 0 && isLingYong && row.upkeepPersonId == getdataListParm.parammaps.loginId" type="success" size="mini" style="width:80px;display:inline-block" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
           <el-button v-if="(row.SHStatue == 1 || row.SHStatue== 4 || row.SHStatue== 6 || row.SHStatue== 8 ) && row.LYStatue == '未领用' && row.statue !== 0 && isLingYong && row.upkeepPersonId == getdataListParm.parammaps.loginId" type="success" size="mini" style="width:80px;display:inline-block" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
@@ -1365,7 +1365,7 @@ export default {
         return '已通过'
         return '已通过'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
@@ -1375,7 +1375,7 @@ export default {
       this.getList()
       this.getList()
       this.getPendingList()
       this.getPendingList()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       console.log('查看', this.seeTemp)
       console.log('查看', this.seeTemp)
       // 流程图
       // 流程图

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

@@ -17,7 +17,7 @@
         <el-option v-for="item in SHStatues" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in SHStatues" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;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="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
         <el-radio-group v-model="radioAll" style="margin-top:-9px" @change="changeAll()">
           <el-radio-button label="全部" />
           <el-radio-button label="全部" />
@@ -107,7 +107,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="操作" align="center" min-width="300" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" min-width="300" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button v-if="isSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <!-- 保养及领用-->
           <!-- 保养及领用-->
           <el-button v-if="(row.SHStatue == 1 || row.SHStatue== 4 || row.SHStatue== 6 || row.SHStatue== 8 ) && row.LYStatue == '未领用' && row.statue !== 0 && isLingYong && row.upkeepPersonId == getdataListParm.parammaps.loginId" type="success" size="mini" style="width:80px;display:inline-block" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
           <el-button v-if="(row.SHStatue == 1 || row.SHStatue== 4 || row.SHStatue== 6 || row.SHStatue== 8 ) && row.LYStatue == '未领用' && row.statue !== 0 && isLingYong && row.upkeepPersonId == getdataListParm.parammaps.loginId" type="success" size="mini" style="width:80px;display:inline-block" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
           <el-button v-else type="success" size="mini" style="width:70px;display:none" @click="handleReceivingSpareParts(row)">保养及领用</el-button>
@@ -1364,7 +1364,7 @@ export default {
         return '已通过'
         return '已通过'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
@@ -1374,7 +1374,7 @@ export default {
       this.getList()
       this.getList()
       this.getPendingList()
       this.getPendingList()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       console.log('查看', this.seeTemp)
       console.log('查看', this.seeTemp)
       // 流程图
       // 流程图

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

@@ -27,7 +27,7 @@
       <el-select v-model="getdataListParm.parammaps.statue" placeholder="设备状态" class="filter-item" style="width: 120px;">
       <el-select v-model="getdataListParm.parammaps.statue" placeholder="设备状态" class="filter-item" style="width: 120px;">
         <el-option v-for="item in equipmentStatusList" :key="item.id" :label="item.name" :value="item.id" />
         <el-option v-for="item in equipmentStatusList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       </el-select>
-      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
     </div>
     </div>
     <div class="month" style="height: 50px;">
     <div class="month" style="height: 50px;">
       <el-button v-if="isMaintenancePlanCopy" type="primary" icon="el-icon-copy-document" @click="handleCopy">复制</el-button>
       <el-button v-if="isMaintenancePlanCopy" type="primary" icon="el-icon-copy-document" @click="handleCopy">复制</el-button>
@@ -92,7 +92,7 @@
           </el-row>
           </el-row>
         </el-form>
         </el-form>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
         <div slot="footer" class="dialog-footer" style="bottom:10px">
-          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+          <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
           <el-button @click="dialogFormVisible = false;">关闭</el-button>
           <el-button @click="dialogFormVisible = false;">关闭</el-button>
         </div>
         </div>
       </div>
       </div>
@@ -428,7 +428,7 @@ export default {
       }
       }
       this.getList()
       this.getList()
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       if (this.dataform.eqClassId == null) {
       if (this.dataform.eqClassId == null) {
         this.getdataListParm.parammaps.typeCode = ''
         this.getdataListParm.parammaps.typeCode = ''
@@ -614,7 +614,7 @@ export default {
       this.createTemp.upkeepCycel = this.upkeepTemps.find(obj => obj.id === item).upkeepCycel
       this.createTemp.upkeepCycel = this.upkeepTemps.find(obj => obj.id === item).upkeepCycel
       this.createTemp.upkeepName = this.upkeepTemps.find(obj => obj.id === item).upkeepName
       this.createTemp.upkeepName = this.upkeepTemps.find(obj => obj.id === item).upkeepName
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false
@@ -717,7 +717,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.isokDisable = true
       this.isokDisable = true
       setTimeout(() => {
       setTimeout(() => {
         this.isokDisable = false
         this.isokDisable = false

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

@@ -25,9 +25,9 @@
         start-placeholder="开始日期"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
         end-placeholder="结束日期"
       />
       />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">搜索</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
       <div>
-        <el-button v-if="isRepair" class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">报修</el-button>
+        <el-button v-if="isRepair" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">报修</el-button>
         <!-- 临时注释 -->
         <!-- 临时注释 -->
         <el-button v-if="isRepairExport" class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
         <el-button v-if="isRepairExport" class="filter-item" type="success" icon="el-icon-download" style="" @click="handleDownload">导出</el-button>
         <!-- 临时注释 -->
         <!-- 临时注释 -->
@@ -119,7 +119,7 @@
       <el-table-column label="审核状态" min-width="100px" align="center" :formatter="SHStatue" />
       <el-table-column label="审核状态" min-width="100px" align="center" :formatter="SHStatue" />
       <el-table-column label="操作" align="center" min-width="400" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" min-width="400" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button v-if="isMaintenanceSee" type="primary" size="mini" @click="handleSee(row)">查看</el-button>
+          <el-button v-if="isMaintenanceSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <!-- 维修审核 -->
           <!-- 维修审核 -->
           <el-button v-if="(row.SHStatue == 2) && isMaintenanceAudit && row.requesterId == getdataListParm.parammaps.loginId" style="display:inline-block" type="success" size="mini" class="successMaintenanceAudit" @click="handleExamine(row)">维修审核</el-button>
           <el-button v-if="(row.SHStatue == 2) && isMaintenanceAudit && row.requesterId == getdataListParm.parammaps.loginId" style="display:inline-block" type="success" size="mini" class="successMaintenanceAudit" @click="handleExamine(row)">维修审核</el-button>
           <el-button v-else style="display:none" type="success" size="mini" class="successMaintenanceAudit" @click="handleExamine(row)">维修审核</el-button>
           <el-button v-else style="display:none" type="success" size="mini" class="successMaintenanceAudit" @click="handleExamine(row)">维修审核</el-button>
@@ -139,8 +139,8 @@
           <el-button v-if="(row.orderStatue == 1 && (row.SHStatue == 1 || row.SHStatue== 4 || row.SHStatue== 6)) && isRepairComplete && (row.pickId == getdataListParm.parammaps.loginId)" style="display:inline-block" type="success" size="mini" class="successMaintenanceAudit" @click="handleRepairComplete(row)">完成维修</el-button>
           <el-button v-if="(row.orderStatue == 1 && (row.SHStatue == 1 || row.SHStatue== 4 || row.SHStatue== 6)) && isRepairComplete && (row.pickId == getdataListParm.parammaps.loginId)" style="display:inline-block" type="success" size="mini" class="successMaintenanceAudit" @click="handleRepairComplete(row)">完成维修</el-button>
           <el-button v-else style="display:none" type="success" size="mini" class="successMaintenanceAudit" @click="handleRepairComplete(row)">完成维修</el-button>
           <el-button v-else style="display:none" type="success" size="mini" class="successMaintenanceAudit" @click="handleRepairComplete(row)">完成维修</el-button>
           <!-- 删除 -->
           <!-- 删除 -->
-          <el-button v-if="((row.orderStatue == 0 && row.SHStatue == 1) && isDelete)" style="display:inline-block" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
-          <el-button v-else style="display:none" type="success" size="danger" @click="handleDelete(row)">删除</el-button>
+          <el-button v-if="((row.orderStatue == 0 && row.SHStatue == 1) && isDelete)" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+          <el-button v-else style="display:none" type="success" size="danger" @click="form_delete(row)">删除</el-button>
           <!-- 驳回报修 -->
           <!-- 驳回报修 -->
           <el-button v-if="(row.orderStatue == 0 && isRejectRepair)" style="display:inline-block;" type="success" class="successMaintenanceAudit" size="mini" @click="handleRejectRepair(row)">报修驳回</el-button>
           <el-button v-if="(row.orderStatue == 0 && isRejectRepair)" style="display:inline-block;" type="success" class="successMaintenanceAudit" size="mini" @click="handleRejectRepair(row)">报修驳回</el-button>
         </template>
         </template>
@@ -256,7 +256,7 @@
         </el-form>
         </el-form>
       </div>
       </div>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?createData():updateData()">保存并关闭</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">保存并关闭</el-button>
         <el-button @click="dialogFormVisible_Create = false;getList()">关闭</el-button>
         <el-button @click="dialogFormVisible_Create = false;getList()">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -1863,7 +1863,7 @@ export default {
         return '已通过'
         return '已通过'
       }
       }
     },
     },
-    handleFilter() {
+    form_search() {
       console.log('点击了table搜索')
       console.log('点击了table搜索')
       this.listLoading = true
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime === null) {
       if (this.getdataListParm.parammaps.inputDatetime === null) {
@@ -1895,7 +1895,7 @@ export default {
         this.distributeLeafletsTemp.repairDept = this.maintainers.find(obj => obj.id == val).deptid
         this.distributeLeafletsTemp.repairDept = this.maintainers.find(obj => obj.id == val).deptid
       }
       }
     },
     },
-    handleCreate() {
+    form_add() {
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible_Create = true
       this.dialogFormVisible_Create = true
 
 
@@ -1926,7 +1926,7 @@ export default {
         })
         })
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.isToDayrResubmit()
       this.isToDayrResubmit()
       GetDataByName(this.resubmit).then(response => {
       GetDataByName(this.resubmit).then(response => {
         console.log('今天已提交,请勿重复提交', this.requestParam,this.resubmit,response)
         console.log('今天已提交,请勿重复提交', this.requestParam,this.resubmit,response)
@@ -1950,11 +1950,11 @@ export default {
                     console.log('新增报修单号', response.data.list[0].orderCode)
                     console.log('新增报修单号', response.data.list[0].orderCode)
                     this.createTemp.repairCode = response.data.list[0].orderCode
                     this.createTemp.repairCode = response.data.list[0].orderCode
                     this.$forceUpdate()
                     this.$forceUpdate()
-                    this.createDataSave()
+                    this.add_dialog_saveSave()
                   })
                   })
                 })
                 })
               } else {
               } else {
-                this.createDataSave()
+                this.add_dialog_saveSave()
               }
               }
             }
             }
           })
           })
@@ -1963,7 +1963,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    createDataSave() {
+    add_dialog_saveSave() {
       this.requestParam.name = 'insertmaintain'
       this.requestParam.name = 'insertmaintain'
       this.requestParam.parammaps = this.createTemp
       this.requestParam.parammaps = this.createTemp
       PostDataByName(this.requestParam).then(response => {
       PostDataByName(this.requestParam).then(response => {
@@ -2031,7 +2031,7 @@ export default {
       }
       }
       this.$forceUpdate()
       this.$forceUpdate()
     },
     },
-    handleSee(row) {
+    form_see(row) {
       console.log(row)
       console.log(row)
       this.seeTemp = Object.assign({}, row)
       this.seeTemp = Object.assign({}, row)
       // 流程图
       // 流程图
@@ -3081,7 +3081,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除?', {
       MessageBox.confirm('确认删除?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
       }).then(() => {
       }).then(() => {

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

@@ -60,7 +60,7 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <div>
       <div>
         <el-button
         <el-button
@@ -69,7 +69,7 @@
           style="margin-left: 10px;"
           style="margin-left: 10px;"
           type="primary"
           type="primary"
           icon="el-icon-edit"
           icon="el-icon-edit"
-          @click="handleCreate"
+          @click="form_add"
         >点检</el-button>
         >点检</el-button>
       </div>
       </div>
     </div>
     </div>
@@ -129,9 +129,9 @@
 
 
       <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width" fixed="right">
       <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleSee(row)">查看</el-button>
-          <!-- <el-button v-if="isSpotCheckUpdate" type="success" size="mini" @click="handleUpdate(row)">编辑</el-button> -->
-          <el-button v-if="isSpotCheckDelate" type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button type="primary" size="mini" @click="form_see(row)">查看</el-button>
+          <!-- <el-button v-if="isSpotCheckUpdate" type="success" size="mini" @click="form_edit(row)">编辑</el-button> -->
+          <el-button v-if="isSpotCheckDelate" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -291,7 +291,7 @@
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
       <div slot="footer" class="dialog-footer">
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="dialogStatus==='create'" type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button v-if="dialogStatus==='create'" type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -709,7 +709,7 @@ export default {
         this.getDictByName = response.data.getDictByName.list
         this.getDictByName = response.data.getDictByName.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -728,7 +728,7 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.assetA.inputDatetime = parseTime(new Date(), '{y}-{m}-{d}')
       this.assetA.inputDatetime = parseTime(new Date(), '{y}-{m}-{d}')
       this.assetA.typeName = ''
       this.assetA.typeName = ''
       this.assetA.assTypeId = ''
       this.assetA.assTypeId = ''
@@ -745,8 +745,8 @@ export default {
       this.temp.assetName = ''
       this.temp.assetName = ''
       this.temp.eqCode = ''
       this.temp.eqCode = ''
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.assetA.employeId = this.$store.state.user.employeid
       this.assetA.employeId = this.$store.state.user.employeid
@@ -754,7 +754,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    // createData() {
+    // add_dialog_save() {
     //   this.postDataPramas.common = { 'returnmap': '0' }
     //   this.postDataPramas.common = { 'returnmap': '0' }
     //   this.postDataPramas.data = []
     //   this.postDataPramas.data = []
     //   this.postDataPramas.data[0] = { 'name': 'checkSpotCheck', 'type': 'v', 'parammaps': { 'assetNumber': this.assetA.assetNumber, 'checkdate': this.assetA.date }}
     //   this.postDataPramas.data[0] = { 'name': 'checkSpotCheck', 'type': 'v', 'parammaps': { 'assetNumber': this.assetA.assetNumber, 'checkdate': this.assetA.date }}
@@ -800,7 +800,7 @@ export default {
     //     }
     //     }
     //   })
     //   })
     // },
     // },
-    createData() {
+    add_dialog_save() {
       this.assetA.inspectionResults = ''
       this.assetA.inspectionResults = ''
       if (this.tempSolr.length != null && this.tempSolr.length > 0) {
       if (this.tempSolr.length != null && this.tempSolr.length > 0) {
         var num = this.tempSolr.filter((i, j) => { return i.checkResult == 0 }).length
         var num = this.tempSolr.filter((i, j) => { return i.checkResult == 0 }).length
@@ -842,7 +842,7 @@ export default {
       })
       })
     },
     },
 
 
-    handleSee(row) {
+    form_see(row) {
       console.log('row', row)
       console.log('row', row)
       this.assetA = Object.assign({}, row) // copy obj
       this.assetA = Object.assign({}, row) // copy obj
       this.dialogStatus = 'see'
       this.dialogStatus = 'see'
@@ -865,7 +865,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.assetA = Object.assign({}, row) // copy obj
       this.assetA = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -885,7 +885,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateAsset'
           this.requestParam.name = 'updateAsset'
@@ -913,7 +913,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('确认删除此条信息?', {
       MessageBox.confirm('确认删除此条信息?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

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

@@ -27,14 +27,14 @@
         class="filter-item"
         class="filter-item"
         type="primary"
         type="primary"
         icon="el-icon-search"
         icon="el-icon-search"
-        @click="handleFilter"
+        @click="form_search"
       >搜索</el-button>
       >搜索</el-button>
       <el-button
       <el-button
         class="filter-item"
         class="filter-item"
         style="margin-left: 10px;"
         style="margin-left: 10px;"
         type="primary"
         type="primary"
         icon="el-icon-edit"
         icon="el-icon-edit"
-        @click="handleCreate"
+        @click="form_add"
       >新增</el-button>
       >新增</el-button>
     </div>
     </div>
 
 
@@ -235,9 +235,9 @@
       </el-table-column>
       </el-table-column>
       <!-- <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
       <!-- <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row)">卡片</el-button>
-          <el-button type="success" size="mini" @click="handleUpdate(row)">编辑</el-button>
-          <el-button type="danger" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button type="primary" size="mini" @click="form_edit(row)">卡片</el-button>
+          <el-button type="success" size="mini" @click="form_edit(row)">编辑</el-button>
+          <el-button type="danger" size="mini" @click="form_delete(row)">删除</el-button>
         </template>
         </template>
       </el-table-column> -->
       </el-table-column> -->
     </el-table>
     </el-table>
@@ -440,9 +440,9 @@
           v-if="dialogStatus==='create'"
           v-if="dialogStatus==='create'"
           ref="createb"
           ref="createb"
           type="success"
           type="success"
-          @click="createData_again()"
+          @click="add_dialog_save_again()"
         >确认新增</el-button>
         >确认新增</el-button>
-        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">确认</el-button>
+        <el-button type="primary" @click="dialogStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
         <el-button @click="dialogFormVisible = false">关闭</el-button>
       </div>
       </div>
     </el-dialog>
     </el-dialog>
@@ -575,7 +575,7 @@ export default {
         this.getDictByName = response.data.getDictByName.list
         this.getDictByName = response.data.getDictByName.list
       })
       })
     },
     },
-    handleFilter() {
+    form_search() {
       this.listLoading = true
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.offset = 1
       this.getList()
       this.getList()
@@ -587,21 +587,21 @@ export default {
       })
       })
       row.status = status
       row.status = status
     },
     },
-    resetTemp() {
+    form_reset() {
       this.temp = {
       this.temp = {
         // 格式化日期
         // 格式化日期
         inputDatetime: parseTime(new Date(), '{y}-{m}-{d}')
         inputDatetime: parseTime(new Date(), '{y}-{m}-{d}')
       }
       }
     },
     },
-    handleCreate() {
-      this.resetTemp()
+    form_add() {
+      this.form_reset()
       this.dialogStatus = 'create'
       this.dialogStatus = 'create'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
       this.$nextTick(() => {
       this.$nextTick(() => {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    createData() {
+    add_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'insertAsset'
           this.requestParam.name = 'insertAsset'
@@ -630,7 +630,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleUpdate(row) {
+    form_edit(row) {
       this.temp = Object.assign({}, row) // copy obj
       this.temp = Object.assign({}, row) // copy obj
       this.dialogStatus = 'update'
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.dialogFormVisible = true
@@ -638,7 +638,7 @@ export default {
         this.$refs['temp'].clearValidate()
         this.$refs['temp'].clearValidate()
       })
       })
     },
     },
-    updateData() {
+    edit_dialog_save() {
       this.$refs['temp'].validate(valid => {
       this.$refs['temp'].validate(valid => {
         if (valid) {
         if (valid) {
           this.requestParam.name = 'updateAsset'
           this.requestParam.name = 'updateAsset'
@@ -666,7 +666,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    handleDelete(row) {
+    form_delete(row) {
       MessageBox.confirm('设备名称:' + row.equipmentName, '确认删除?', {
       MessageBox.confirm('设备名称:' + row.equipmentName, '确认删除?', {
         confirmButtonText: '确认',
         confirmButtonText: '确认',
         cancelButtonText: '取消',
         cancelButtonText: '取消',

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно