启停页面、基础信息增加指定人

.eslintignore

@@ -2,3 +2,4 @@ build/*.js
 src/assets
 public
 dist
+*.vue

src/api/table.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-export function getList(params) {
+export function get_table_data(params) {
   return request({
     url: '/table/list',
     method: 'get',

src/views/asset/SST/index.vue

@@ -96,7 +96,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
       <el-form ref="temp" :rules="rules" :model="temp" label-position="right" label-width="140px">
@@ -194,7 +194,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button v-if="temp.changeStatue =='停用'" type="primary" @click="createStartData()">开启</el-button>
         <el-button v-if="temp.changeStatue =='启用'" type="primary" @click="createStopData()">停用</el-button>
-        <el-button @click="dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button @click="dialogFormVisible = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -265,7 +265,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="totalSee>0" :total="totalSee" :page.sync="getdataListParmSee.offset" :limit.sync="getdataListParmSee.pagecount" @pagination="getListSee" />
+        <pagination v-show="totalSee>0" :total="totalSee" :page.sync="getdataListParmSee.offset" :limit.sync="getdataListParmSee.pagecount" @pagination="get_table_dataSee" />
       </div>
       <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:10px">
         <el-button @click="dialogFormVisibleCard = false">关闭</el-button>
@@ -432,7 +432,7 @@ export default {
   created() {
     this.$store.dispatch('user/getInfo')
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -503,7 +503,7 @@ export default {
       }
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
 
       if (this.getdataListParm.parammaps.enabledTime === null) {
@@ -602,7 +602,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -682,7 +682,7 @@ export default {
             duration: 2000
           })
         } else {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisibleSST = false
           this.$notify({
             title: '成功',
@@ -715,7 +715,7 @@ export default {
             duration: 2000
           })
         } else {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisibleSST = false
           this.$notify({
             title: '成功',
@@ -742,7 +742,7 @@ export default {
             duration: 2000
           })
         } else {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisibleSST = false
 
           this.$notify({
@@ -784,7 +784,7 @@ export default {
     //               duration: 2000
     //             })
     //           } else {
-    //             this.getList()
+    //             this.get_table_data()
     //             this.dialogFormVisible = false
     //             this.$notify({
     //               title: '',
@@ -829,7 +829,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -868,7 +868,7 @@ export default {
     //               duration: 2000
     //             })
     //           } else {
-    //             this.getList()
+    //             this.get_table_data()
     //             this.dialogFormVisible = false
     //             this.$notify({
     //               title: '',
@@ -913,7 +913,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -932,16 +932,16 @@ export default {
       this.cardTitle = '启停记录  设备名称：' + row.eqName + '设备编号：' + row.eqCode
       this.dialogFormVisibleCard = true
       this.getdataListParmSee.parammaps.assetId = row.id
-      this.getListSee()
+      this.get_table_dataSee()
     },
     form_searchDelivery() {
       if (this.getdataListParmSee.parammaps.inputDatetime === null) {
         this.getdataListParmSee.parammaps.inputDatetime = ''
       }
       this.getdataListParmSee.offset = 1
-      this.getListSee()
+      this.get_table_dataSee()
     },
-    getListSee() {
+    get_table_dataSee() {
       if (this.getdataListParmSee.parammaps.startTime !== undefined && this.getdataListParmSee.parammaps.startTime !== null) {
 
       } else {

src/views/asset/assetDesignee/index.vue

@@ -0,0 +1,1554 @@
+<template>
+  <div class="app-container">
+    这个页面取消，暂停开发
+ 
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons')
+// 引入
+import { GetDataByName, GetDataByNames, PostDataByName, PostDataByNames, getRecuData, checkButtons, ExecDataByConfig, failproccess, GetAccount, GetReportform } from '@/api/common'
+import waves from '@/directive/waves'
+import { parseTime, sortChange, json2excel } from '@/utils/index.js'
+import Pagination from '@/components/Pagination'
+import { MessageBox } from 'element-ui'
+import TreeSelect from '@/components/TreeSelect'
+import Cookies from 'js-cookie'
+import { getToken } from '@/utils/auth'
+export default {
+  inject: ['reload'],
+  name: 'AssetDesignee',
+  components: { Pagination, TreeSelect },
+  directives: { waves },
+  data() {
+    return {
+      isBasicsAdd: [], isBasicsCard: [], isBasicsUpdate: [], isBasicsDel: [], isBasicsDel2: [], isBasic: [], isBasicSH: [], isBasicExamine: [],
+      rules: {
+        // assetCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        eqName: [{ required: true, message: '必填', trigger: 'blur' }],
+        eqCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        financeCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        departmentId: [{ required: true, message: '必填', trigger: 'blur' }],
+        employeeId: [{ required: true, message: '必填', trigger: 'blur' }],
+        depreciation: [{ type: 'number', required: true, validator: (rule, value, callback) => {
+          if (!value) {
+            callback(new Error('不能为空'))
+          }
+          setTimeout(() => {
+            const re = /^[0-9]*[1-9][0-9]*$/ // /^[0-9]*[1-9][0-9]*$/
+            const rsCheck = re.test(value)
+            if (!rsCheck) {
+              callback(new Error('请输入正整数'))
+            } else {
+              callback()
+            }
+          }, 0)
+        }, trigger: 'blur' }]
+      },
+      placeholder:"请选择设备类别",
+      findAllBrand: [], findAllProvider: [],
+      findAllAssetType: [], findAllPasture: [], findAllDepart: [], findAllEmploye: [],
+      getDictByName: [], upkeepgrades: [], createDepartList: [],
+      statues: [{ id: '0', name: '审核中' }, { id: '1', name: '已通过' }, { id: '2', name: '未通过' }],
+      depreciationAlertList: [{ id: '0', name: '正常' }, { id: '1', name: '到期预警' }, { id: '2', name: '超期使用' }],
+      requestParams: [
+        { name: 'findAllBrand', offset: 0, pagecount: 0, params: [] },
+        { name: 'findAllProvider', offset: 0, pagecount: 0, params: [] },
+        { name: 'findAlllAssetProvider', offset: 0, pagecount: 0, params: [] },
+        { name: 'findAllAssetType', offset: 0, pagecount: 0, params: [] },
+        { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }},
+        { name: 'findAllEmploye', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid') }},
+        { name: 'getDictByName', offset: 0, pagecount: 0, params: ['资产状态'] },
+        { name: 'getdictbyname', offset: 0, pagecount: 0, params: ['保养级别'] }
+      ],
+      getDepartParam: { name: 'findAllDepart1', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid'), 'eId': Cookies.get('employeid') }},
+      disabled: false,  
+      nodeKey: 'id',
+      defaultCheckedKeys: [],
+      parentClass: [],
+      defaultProps: { children: 'children', label: 'typeName' },
+      getRecuListParm: { name: 'getAssetTypeList', idname: 'id', params: [-1] },
+      tableKey: 0,
+      list: [],
+      total: 0,
+      listLoading: true,
+      getdataListParm: {
+        name: 'getAssetList', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
+        parammaps: {proId:'',brandId:'', assetCode:'',eqCode: '', eqName: '', departmentId: '', pastureId: Cookies.get('pastureid'), pastureName: Cookies.get('pasturename'), status: '', inputDatetime1: '', startTime: '', stopTime: '', inputDatetime2: '', startTime2: '', stopTime2: '', inputDatetime3: '', startTime3: '', stopTime3: '', warning: '', eqClassId: '' }
+      },
+     
+      textMap: { update: '编辑', create: '新增', card: '查看设备信息', examine: '审核', change: '批量变更' },
+      dialogFormVisible: false,
+      dialogStatus: '',
+      pickerOptions1: {
+        disabledDate(time) {
+          return time.getTime() > Date.now()// 当天之前的时间可选
+        }
+      },
+
+      dialogImageUrl: '', dialogVisible: false,
+      fileList: [], showUpload: false,
+      headers: { optname: 'insertcustompic', id: 1, token: getToken() },
+      uploadImageUrl: process.env.VUE_APP_BASE_API + 'authdata/uploaderimage',
+      width: '',
+
+      createTemp: { inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), employeId: this.$store.state.user.employeid, inputUser: this.$store.state.user.employeid, deptId: this.$store.state.user.departmentid, departmentName: Cookies.get('departmentname'), pastureId: this.$store.state.user.pastureid, assetCode: '', eqClassName: '', eqClassId: '', eqCode: '', eqName: '', specification: '', providerName: '', brandName: '', financeCode: '', status: '正常', purpose: '', purchaseDate: parseTime(new Date(), '{y}-{m}-{d}'), entranceDate: parseTime(new Date(), '{y}-{m}-{d}'), yearUpkeepCost: '', yearMaintainDost: '', yuanzhi: '', baseHours: '', upkeepgrade: '', salvage: '', subtractvalue: '', yearMaintainCost: '', brandId: '', providerId: '', inputUserName: '', employeName: this.$store.state.user.employename, depreciation: '' },
+      requestParam: { name: 'insertAsset', offset: 0, pagecount: 0, parammaps: {}},
+      seeTemp: {},
+ 
+      dialogFormVisible_See: false,
+      activeName: 'first',
+
+      maintainTypes: [{ id: '0', name: '周保养' }, { id: '1', name: '月保养' }, { id: '2', name: '间隔保养' }],
+      changeStates: [{ id: '17', name: '正常' }, { id: '18', name: '闲置' }, { id: '19', name: '报废' }, { id: '20', name: '封存' }],
+
+      getdataEQNumber: { name: 'cerateEQNumber', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: {}},
+
+      dialoFormVisible_Examine: false,
+      examineTemp: { SHstatue: 1 },
+      statueReason: false,
+      activeList: [],
+      active: 3,
+      isFlowChart: false,
+      isDisplayRecord: false,
+      buttons: [],
+      // 查看-点检记录
+      getAssetBigSpotCheckListParm: { name: 'getAssetBigSpotCheck1', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { inputDatetimeSpotCheck1: '', startTime: '', stopTime: '' }},
+      listLoadingSpotCheck1: false,
+      listSpotCheck1: [],
+      totalSpotCheck1: 0,
+      // 查看-保养记录
+      getBigupkeepbyeqParm: { name: 'getBigupkeepbyeq', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { inputDatetimeUpkeepbyeq: '', startTime: '', stopTime: '', upkeepType: '', upkeepCode: '' }},
+      listLoadingUpkeepbyeq: false,
+      listUpkeepbyeq: [],
+      totalUpkeepbyeq: 0,
+      // 查看-维修记录
+      getAssetMaintainParm: { name: 'getAssetMaintain1', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { inputDatetimeAssetMaintain: '', startTime: '', stopTime: '', repairCode: '' }},
+      listLoadingAssetMaintain: false,
+      listAssetMaintain: [],
+      totalAssetMaintain: 0,
+      // 查看-启停记录
+      getAssetSTTParm: { name: 'getAssetSTT1', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { startTime: '', stopTime: '' }},
+      listLoadingAssetSTT: false,
+      listAssetSTT: [],
+      totalAssetSTT: 0,
+      // 查看-变更记录
+      getAssetChangeParm: { name: 'getAssetChange1', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { startTime: '', stopTime: '', changeStatue: '', inputDatetimeAssetChange: '' }},
+      listLoadingAssetChange: false,
+      listAssetChange: [],
+      totalAssetChange: 0,
+      // 查看-备件领用记录
+      getAssetPartApplyParm: { name: 'getAssetPartApply', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { startTime: '', stopTime: '', inputDatetimeAssetPartApply: '' }},
+      listLoadingAssetPartApply: false,
+      listAssetPartApply: [],
+      totalAssetPartApply: 0,
+      downLoadParm: {},
+      downLoadList: [],
+      requestBrand: {
+        name: 'getBrandByPartCode',
+        page: 0,
+        offset: 0,
+        pagecount: 10,
+        returntype: 'Map',
+        parammaps: {}
+      },
+      BrandList: [],
+      requestEmploye: {
+        name: 'findAllEmployeV2',
+        page: 0,
+        offset: 0,
+        pagecount: 10,
+        returntype: 'Map',
+        parammaps: {
+          pastureId: Cookies.get('pastureid')
+        }
+      },
+      employeList: [],
+      totaltitle: 0,
+      getBarChart1Parm: {
+        name: 'getReportEqCostYear',
+        parammaps: {}
+      },
+      barChart1: null,
+      chart_data1: {},
+      getBarChart2Parm: {
+        name: 'getReportEqCostMonth',
+        parammaps: {
+          receiveTime: new Date().getFullYear()
+        }
+      },
+      barChart2: null,
+      chart_data2: {},
+      dialogFormVisible_ChartSee: false,
+      getChartSeeParm: {
+        name: 'getEqPartuseDetailList',
+        page: 0,
+        offset: 0,
+        pagecount: 10,
+        returntype: 'Map',
+        parammaps: {
+          receiveTime: '',
+          eqId: '',
+          useTypeV: '',
+          inputDatetime2: '',
+          stopTime: '',
+          startTime: ''
+        }
+      },
+      listLoadingChartSee: false,
+      totalChartSee: 0,
+      listChartSee: [],
+      pageNum: 0,
+      pageSize: 0,
+      pageNumSH: 0,
+      pageSizeSH: 0,
+      useTypes: [{ id: 0, name: '维修' }, { id: 1, name: '保养' }],
+      downLoadParm2: {},
+      downLoadList2: [],
+      isPercentage: false,
+      percentage: 1,
+      isokDisable: false,
+      edit: 0,
+      selectionList: [],
+      dialogFormVisible_change: false,
+      batchChange: {
+        temp: { departmentId: '', employeeId: '' },
+        getdataListParmDept: { name: 'getAssetAndEmpList', offset: 0, pagecount: 0, parammaps: {}},
+        deptList: [],
+        getdataListParmPerson: { name: 'getAllEmp', offset: 0, pagecount: 0, parammaps: {}},
+        personList: []
+      },
+      rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
+      cellStyle: { padding: 0 + 'px' }
+    }
+  },
+  computed: {
+    // 设置请求头
+    // headers() {
+    //   return {
+    //     // 设置token
+    //     // eslint-disable-next-line no-undef
+    //     token: getToken()
+    //   }
+    // },
+    uploadData() {
+      return {
+        name: 'importStockUse',
+        importParams: '牧场,设备类别,资产编号,设备名称,设备内部编号,设备规格,品牌,供应商,用途,状态,购置日期,入场日期,折旧年限,财务编号,原值,残值,月核减值,保养级别,保养费用,维修费用,维修费用,基数(小时),部门,责任人,录入人,录入时间,使用时长(年),使用率(%),SignColumn',
+        sheetname: 'SheetJS'
+      }
+    },
+   
+    // 设置上传地址
+    uploadExcelUrl() {
+      // process.env.VUE_APP_BASE_API是服务器的路径，也是axios的基本路径
+      return process.env.VUE_APP_BASE_API + 'authdata/equipment'
+    }
+  },
+  created() {
+     
+ 
+  },
+  methods: {
+     // 导入
+     beforeImportExcel(file) {
+      const isLt2M = file.size / 1024 / 1024 < 10
+      if (!isLt2M) {
+        this.$message.error('上传文件大小不能超过 10MB!')
+      }
+      return isLt2M
+    },
+    handleImportExcelSuccess(res, file) {
+      if (res.msg === 'ok') {
+        this.$message({
+          title: '成功',
+          message: '导入成功:' + res.data.success + '条!',
+          type: 'success',
+          duration: 2000
+        })
+        if (res.data.err_count > 0) {
+          this.$notify({
+            title: '失败',
+            message: '导入失败:' + res.data.err_count + '条!',
+            type: 'danger',
+            duration: 2000
+          })
+
+          
+        }
+      } else {
+        this.$notify({
+          title: '失败',
+          message: '上传失败',
+          type: 'danger',
+          duration: 2000
+        })
+      }
+    },
+    formatJsonTemp(filterVal, jsonData) {
+      return jsonData.map(v =>
+        filterVal.map(j => {
+          if (j === 'timestamp') {
+            return parseTime(v[j])
+          } else {
+            return v[j]
+          }
+        })
+      )
+    },
+    tableSort2(column) {
+      sortChange(column, this.list)
+    },
+    tableSort(column) {
+      if (this.activeName == 'third') {
+        sortChange(column, this.listUpkeepbyeq)
+      } else if (this.activeName == 'fouth') {
+        sortChange(column, this.listAssetMaintain)
+      } else if (this.activeName == 'seventh') {
+        sortChange(column, this.listAssetPartApply)
+      }
+    },
+    get_auto_buttons() {
+      // 新增
+      const BasicsAdd = 'asset:basics:add'
+      const isBasicsAdd = checkButtons(this.$store.state.user.buttons, BasicsAdd)
+      this.isBasicsAdd = isBasicsAdd
+      // 卡片
+      const BasicsCard = 'asset:basics:kapian'
+      const isBasicsCard = checkButtons(this.$store.state.user.buttons, BasicsCard)
+      this.isBasicsCard = isBasicsCard
+      // 编辑
+      const BasicsUpdate = 'asset:basics:update'
+      const isBasicsUpdate = checkButtons(this.$store.state.user.buttons, BasicsUpdate)
+      this.isBasicsUpdate = isBasicsUpdate
+      // 删除
+      const BasicsDel = 'asset:basics:del'
+      const isBasicsDel = checkButtons(this.$store.state.user.buttons, BasicsDel)
+      this.isBasicsDel = isBasicsDel
+      // 设备基础信息-删除
+      const BasicsDel2 = 'asset:basics:del2'
+      const isBasicsDel2 = checkButtons(this.$store.state.user.buttons, BasicsDel2)
+      this.isBasicsDel2 = isBasicsDel2
+      // 设备基础信息
+      const Basic = 'asset:basic:basic'
+      const isBasic = checkButtons(this.$store.state.user.buttons, Basic)
+      this.isBasic = isBasic
+      // 设备审核
+      const BasicSH = 'asset:basic:shjm'
+      const isBasicSH = checkButtons(this.$store.state.user.buttons, BasicSH)
+      this.isBasicSH = isBasicSH
+      // 审核
+      const BasicExamine = 'asset:basic:shenhe'
+      const isBasicExamine = checkButtons(this.$store.state.user.buttons, BasicExamine)
+      this.isBasicExamine = isBasicExamine
+    },
+    // 2-2:下拉框
+    get_select_list() {
+      GetDataByNames(this.requestParams).then(response => {
+        if (response.data.list !== null) {
+          this.findAllBrand = response.data.findAllBrand.list
+          this.findAllProvider = response.data.findAllProvider.list
+          this.findAllAssetType = response.data.findAllAssetType.list
+          this.findAllPasture = response.data.findAllPasture.list
+          this.findAllEmploye = response.data.findAllEmploye.list
+          this.getDictByName = response.data.getDictByName.list
+          this.upkeepgrades = response.data.getdictbyname.list
+          this.getDepartDownList()
+        }
+      })
+    },
+    getDepartDownList() {
+      GetDataByName(this.getDepartParam).then(response => {
+        this.findAllDepart = response.data.list
+      })
+    },
+    changePastureName(item) {
+      this.getDepartParam.parammaps.pastureId = this.findAllPasture.find(obj => obj.name == item).id
+      this.getdataListParm.parammaps.departmentId = ''
+      this.getDepartDownList()
+    },
+    getCreateDepartDownList() {
+      GetDataByName(this.getDepartParam).then(response => {
+        this.createDepartList = response.data.list
+        if (this.edit == 1) {
+          if (this.createDepartList.find(obj => obj.id == Cookies.get('departmentid'))) {
+            this.createTemp.departmentId = parseInt(Cookies.get('departmentid'))
+            this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == Cookies.get('departmentid')).name
+            this.createTemp.deptId = parseInt(Cookies.get('departmentid'))
+          } else {
+            this.createTemp.departmentId = response.data.list[0].id
+            this.createTemp.departmentId = response.data.list[0].id
+            this.createTemp.deptId = response.data.list[0].name
+          }
+        }
+      })
+    },
+    changePasture(item) {
+      this.getDepartParam.parammaps.pastureId = item
+      this.edit = 1
+      this.getCreateDepartDownList()
+    },
+    changeDepart(item) {
+      this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
+    },
+    get_table_data() {
+      this.listLoading = true
+      if (this.getdataListParm.parammaps.inputDatetime1 == null) {
+        this.getdataListParm.parammaps.inputDatetime1 = ''
+        this.getdataListParm.parammaps.startTime = ''
+        this.getdataListParm.parammaps.stopTime = ''
+      } else {
+        this.getdataListParm.parammaps.startTime = this.getdataListParm.parammaps.inputDatetime1[0]
+        this.getdataListParm.parammaps.stopTime = this.getdataListParm.parammaps.inputDatetime1[1]
+      }
+      if (this.getdataListParm.parammaps.inputDatetime2 == null || this.getdataListParm.parammaps.inputDatetime2 == '') {
+        this.getdataListParm.parammaps.inputDatetime2 = ''
+        this.getdataListParm.parammaps.startTime2 = ''
+        this.getdataListParm.parammaps.stopTime2 = ''
+      } else {
+        this.getdataListParm.parammaps.startTime2 = this.getdataListParm.parammaps.inputDatetime2[0]
+        this.getdataListParm.parammaps.stopTime2 = this.getdataListParm.parammaps.inputDatetime2[1]
+      }
+      if (this.getdataListParm.parammaps.inputDatetime3 == null || this.getdataListParm.parammaps.inputDatetime3 == '') {
+        this.getdataListParm.parammaps.inputDatetime3 = ''
+        this.getdataListParm.parammaps.startTime3 = ''
+        this.getdataListParm.parammaps.stopTime3 = ''
+      } else {
+        this.getdataListParm.parammaps.startTime3 = this.getdataListParm.parammaps.inputDatetime3[0]
+        this.getdataListParm.parammaps.stopTime3 = this.getdataListParm.parammaps.inputDatetime3[1]
+      }
+      GetDataByName(this.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.list = response.data.list
+           
+          this.pageNum = response.data.pageNum
+          this.pageSize = response.data.pageSize
+        } else {
+          this.list = []
+        }
+        this.total = response.data.total
+        setTimeout(() => {
+          this.listLoading = false
+        }, 100)
+        this.get_select_list()
+      })
+    },
+     
+    SHStatus: function(cellValue) {
+      if (cellValue.SHStatus == 0) {
+        return '审核中'
+      } else if (cellValue.SHStatus == 1) {
+        return '已通过'
+      } else if (cellValue.SHStatus == 2) {
+        return '未通过'
+      } else if (cellValue.SHStatus == 3) {
+        return '历史数据'
+      }
+    },
+    form_search() {
+      this.listLoading = true
+      this.getdataListParm.parammaps.pastureId = ''
+      if (this.getdataListParm.parammaps.warning !== '') {
+        this.getdataListParm.parammaps.d1 = 1
+      } else {
+        this.getdataListParm.parammaps.d1 = ''
+      }
+      if (this.getdataListParm.parammaps.inputDatetime1 == null) {
+        this.getdataListParm.parammaps.inputDatetime1 = ''
+        this.getdataListParm.parammaps.startTime = ''
+        this.getdataListParm.parammaps.stopTime = ''
+      } else {
+        this.getdataListParm.parammaps.startTime = this.getdataListParm.parammaps.inputDatetime1[0]
+        this.getdataListParm.parammaps.stopTime = this.getdataListParm.parammaps.inputDatetime1[1]
+      }
+      console.log(this.getdataListParm.parammaps.inputDatetime2)
+      if (this.getdataListParm.parammaps.inputDatetime2 == null) {
+        this.getdataListParm.parammaps.inputDatetime2 = ''
+        this.getdataListParm.parammaps.startTime2 = ''
+        this.getdataListParm.parammaps.stopTime2 = ''
+      } else {
+        this.getdataListParm.parammaps.startTime2 = this.getdataListParm.parammaps.inputDatetime2[0]
+        this.getdataListParm.parammaps.stopTime2 = this.getdataListParm.parammaps.inputDatetime2[1]
+      }
+      if (this.getdataListParm.parammaps.inputDatetime3 == null) {
+        this.getdataListParm.parammaps.inputDatetime3 = ''
+        this.getdataListParm.parammaps.startTime3 = ''
+        this.getdataListParm.parammaps.stopTime3 = ''
+      } else {
+        this.getdataListParm.parammaps.startTime3 = this.getdataListParm.parammaps.inputDatetime3[0]
+        this.getdataListParm.parammaps.stopTime3 = this.getdataListParm.parammaps.inputDatetime3[1]
+      }
+      this.getdataListParm.offset = 1
+      this.get_table_data()
+    },
+ 
+    handlePicChange(file, fileList) {
+      if (fileList.length > 0) {
+        this.$nextTick(() => {
+          this.showUpload = true
+        })
+      } else {
+        this.$nextTick(() => {
+          this.showUpload = false
+        })
+      }
+      console.log(this.createTemp)
+    },
+    handlePicSuccess(response, file, fileList) {
+      if (fileList.length > 0) {
+        this.$nextTick(() => {
+          this.showUpload = true
+        })
+      } else {
+        this.$nextTick(() => {
+          this.showUpload = false
+        })
+      }
+      if (this.createTemp.picpath === undefined || this.createTemp.picpath === '' || this.createTemp.picpath == -1) {
+        this.$set(this.createTemp, 'picpath', response.execresult.LastInsertId)
+      }
+    },
+    handlePicRemove(file, fileList) {
+      if (this.dialogStatus === 'create') {
+        if (fileList.length < 1) {
+          this.showUpload = false
+        }
+        for (const key in this.createTemp) {
+          if (this.createTemp[key] === file.response.execresult.LastInsertId) {
+            this.$delete(this.createTemp, key)
+          }
+        }
+      } else {
+        if (fileList.length < 1) {
+          this.$nextTick(() => {
+            this.showUpload = false
+          })
+        }
+        const url = file.url
+        console.log(url, 'url')
+        for (const key in this.createTemp) {
+          console.log(this.createTemp[key], 'createTemp[key]')
+          if (this.createTemp[key] === url) {
+            console.log(key)
+            if (key === 'picpath') {
+              this.$delete(this.createTemp, 'picpath')
+              this.$delete(this.createTemp, 'picId')
+            }
+          }
+        }
+      }
+      console.log(this.createTemp, '文件列表移除文件时的钩子row')
+    },
+    handlePicPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    onLoad(e) {
+      const img = e.target
+      let width = 0
+      if (img.fileSize > 0 || (img.width > 1 && img.height > 1)) {
+        width = img.width + 40
+      }
+      this.width = width + 'px'
+    },
+    add_dialog_saveAdd() {
+      console.log('点击了保存')
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          for (var i = 0; i < this.listAdd.length; i++) {
+            if (this.listAdd[i].score == null) {
+              this.$message({ type: 'warning', message: '请检查检查结果是否为空', duration: 2000 })
+              return false
+            }
+            if (this.listAdd[i].pic1 == undefined) {
+              this.listAdd[i].pic1 = -1
+            }
+            if (this.listAdd[i].pic2 == undefined) {
+              this.listAdd[i].pic2 = -1
+            }
+            if (this.listAdd[i].pic3 == undefined) {
+              this.listAdd[i].pic3 = -1
+            }
+          }
+          this.postDataPramas.common = { 'returnmap': '0' }
+          this.postDataPramas.data = []
+          this.postDataPramas.data[0] = { 'name': 'insertBigjudge', 'type': 'e', 'parammaps': {
+            pastureId: this.createTemp.pastureId,
+            batime: this.createTemp.batime,
+            empId: this.createTemp.empId
+          }}
+          this.postDataPramas.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.listAdd }}
+          this.postDataPramas.data[1].children = []
+          this.postDataPramas.data[1].children[0] = { 'name': 'insertjudge', 'type': 'e', 'parammaps': {
+            bigId: '@insertBigjudge.LastInsertId',
+            statue: '@insertSpotList.statue',
+            score: '@insertSpotList.score',
+            note: '@insertSpotList.note',
+            pic1: '@insertSpotList.pic1',
+            pic2: '@insertSpotList.pic2',
+            pic3: '@insertSpotList.pic3'
+          }}
+          ExecDataByConfig(this.postDataPramas).then(response => {
+            console.log('新增保存发送参数', this.postDataPramas)
+            if (response.msg === 'fail') {
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.getdataListParm.parammaps.inputDatetime = ''
+              this.get_table_data()
+              this.dialogFormVisibleAdd = false
+              this.createTemp.providerName = ''
+              this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+            }
+          })
+        }
+      })
+    },
+    beforeRemove(file, fileList) {
+      console.log(file.response, '删除文件之前的钩子，参数为上传的文件和文件列表')
+      return this.$confirm('删除当前图片, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' })
+    },
+    resetCreateTemp() {
+      this.defaultCheckedKeys = []
+      this.createTemp.defaultCheckedKeys = []
+      this.createTemp.brandId = ''
+      this.createTemp.providerId = ''
+      this.createTemp.inputDatetime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.createTemp.eqClassName = ''
+      this.createTemp.eqClassId = ''
+      this.createTemp.employeName = Cookies.get('employename')
+      this.createTemp.employeId = Cookies.get('employeid')
+      this.createTemp.inputUser = Cookies.get('employeid')
+      this.createTemp.deptId = parseInt(Cookies.get('departmentid'))
+      this.createTemp.departmentName = Cookies.get('departmentname')
+      this.createTemp.pastureId = parseInt(Cookies.get('pastureid'))
+      this.createTemp.eqCode = ''
+      this.createTemp.eqName = ''
+      this.createTemp.specification = ''
+      this.createTemp.providerName = ''
+      this.createTemp.financeCode = ''
+      this.createTemp.status = '正常'
+      this.createTemp.providerName = ''
+      this.createTemp.brandName = ''
+      this.createTemp.purpose = ''
+      this.createTemp.purchaseDate = parseTime(new Date(), '{y}-{m}-{d}')
+      this.createTemp.entranceDate = parseTime(new Date(), '{y}-{m}-{d}')
+      this.createTemp.assetCode = ''
+      this.createTemp.yearUpkeepCost = ''
+      this.createTemp.yearMaintainDost = ''
+      this.createTemp.yuanzhi = ''
+ 
+      this.createTemp.baseHours = ''
+      this.createTemp.upkeepgrade = 113
+      this.createTemp.salvage = ''
+      this.createTemp.subtractvalue = ''
+      this.createTemp.yearMaintainCost = ''
+      this.createTemp.inputUserName = ''
+      this.createTemp.picpath = ''
+      this.fileList = []
+      this.showUpload = false
+      this.createTemp.fileList = []
+      this.createTemp.depreciation = ''
+    },
+    form_add() {
+      this.resetCreateTemp()
+      this.edit = 1
+      this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
+      this.getCreateDepartDownList()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['createTemp'].clearValidate()
+      })
+    },
+    changeBrand(item) {
+      this.createTemp.brandName = this.findAllBrand.find(obj => obj.id === item).name
+    },
+    changeUpkeepgrade(item) {
+      console.log(item)
+    },
+    upkeepgradeChange(e) {
+      if (!e) {
+        this.$refs['upkeepgrade'].blur()
+      }
+    },
+    popoverHide(checkedIds, checkedData) {
+      console.log(checkedIds, checkedData)
+      if (checkedIds !== null) {
+        this.getdataEQNumber.parammaps.eqCode = checkedData.typeCode
+        // if (checkedData.children === undefined) {
+        //   this.createTemp.eqClassId = checkedData.eqClassId
+        //   this.createTemp.eqName = checkedData.NewName
+        //   this.getdataListParm.parammaps.eqClassId = checkedData.eqClassId
+        //   this.getEQNumber()
+        // } else {
+        //   this.defaultCheckedKeys = []
+        //   this.createTemp.eqClassId = ''
+        //   this.getdataListParm.parammaps.eqClassId = ''
+        //   this.$message({ type: 'warning', message: '请选择具体设备类型' })
+        // }
+        this.createTemp.eqClassId = checkedData.eqClassId
+          this.createTemp.eqName = checkedData.NewName
+          this.getdataListParm.parammaps.eqClassId = checkedData.eqClassId
+          this.getEQNumber()
+      } else {
+        this.defaultCheckedKeys = []
+        this.createTemp.eqClassId = ''
+        this.getdataListParm.parammaps.eqClassId = ''
+      }
+    },
+    add_dialog_save() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          console.log(this.createTemp)
+          this.requestParam.name = 'insertAsset'
+          if (this.createTemp.status == '正常') { this.createTemp.status = 17 }
+          if (this.createTemp.providerId == '') { this.createTemp.providerId = 0 }
+          if (this.createTemp.brandId == '') { this.createTemp.brandId = 0 }
+          if (this.createTemp.yuanzhi == '') { this.createTemp.yuanzhi = 0 }
+          if (this.createTemp.salvage == '') { this.createTemp.salvage = 0 }
+          if (this.createTemp.subtractvalue == '') { this.createTemp.subtractvalue = 0 }
+          if (this.createTemp.yearUpkeepCost == '') { this.createTemp.yearUpkeepCost = 0 }
+          if (this.createTemp.yearMaintainCost == '') { this.createTemp.yearMaintainCost = 0 }
+          if (this.createTemp.baseHours == '') { this.createTemp.baseHours = 0 }
+          // 原值yuanzhi残值salvage月核减值subtractvalue保养费用yearUpkeepCost维修费用yearMaintainCost
+          var rulesValue = /^\d+(\.\d{1,3})?$/
+          this.requestParam.parammaps = this.createTemp
+          this.requestParam.parammaps.picpath = this.createTemp.picpath
+          if (this.createTemp.yuanzhi !== '' || this.createTemp.salvage !== '' || this.createTemp.subtractvalue !== '' || this.createTemp.yearUpkeepCost !== '' || this.createTemp.yearMaintainCost !== '') {
+            this.requestParam.parammaps.yuanzhi = parseFloat(this.createTemp.yuanzhi)
+            if (!rulesValue.test(parseFloat(this.createTemp.yuanzhi))) {
+              this.$message({ type: 'error', message: '原值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.salvage))) {
+              this.$message({ type: 'error', message: '残值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.subtractvalue))) {
+              this.$message({ type: 'error', message: '月核减值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.yearUpkeepCost))) {
+              this.$message({ type: 'error', message: '保养费用输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.yearMaintainCost))) {
+              this.$message({ type: 'error', message: '维修费用请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+          }
+          PostDataByName(this.requestParam).then(response => {
+            console.log('新增保存发送参数', this.requestParam)
+            if (response.msg !== 'fail') {
+              if (this.getdataListParm.parammaps.inputDatetime1 === null) {
+                this.getdataListParm.parammaps.inputDatetime1 = ''
+              }
+              this.dialogFormVisible = false
+              this.get_table_data()
+              this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
+              // this.reload()
+            } else {
+              failproccess(response, this.$notify)
+            }
+          })
+        }
+      })
+    },
+    // 继续新增
+    add_dialog_save_again() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          this.requestParam.name = 'insertAsset'
+          if (this.createTemp.status == '正常') { this.createTemp.status = 17 }
+          if (this.createTemp.providerId == '') { this.createTemp.providerId = 0 }
+          if (this.createTemp.brandId == '') { this.createTemp.brandId = 0 }
+          if (this.createTemp.yuanzhi == '') { this.createTemp.yuanzhi = 0 }
+          if (this.createTemp.salvage == '') { this.createTemp.salvage = 0 }
+          if (this.createTemp.subtractvalue == '') { this.createTemp.subtractvalue = 0 }
+          if (this.createTemp.yearUpkeepCost == '') { this.createTemp.yearUpkeepCost = 0 }
+          if (this.createTemp.yearMaintainCost == '') { this.createTemp.yearMaintainCost = 0 }
+          if (this.createTemp.baseHours == '') { this.createTemp.baseHours = 0 }
+          // 原值yuanzhi残值salvage月核减值subtractvalue保养费用yearUpkeepCost维修费用yearMaintainCost
+          var rulesValue = /^\d+(\.\d{1,3})?$/
+          this.requestParam.parammaps = this.createTemp
+          this.requestParam.parammaps.picpath = this.createTemp.picpath
+          if (this.createTemp.yuanzhi !== '' || this.createTemp.salvage !== '' || this.createTemp.subtractvalue !== '' || this.createTemp.yearUpkeepCost !== '' || this.createTemp.yearMaintainCost !== '') {
+            this.requestParam.parammaps.yuanzhi = parseFloat(this.createTemp.yuanzhi)
+            // if (!rulesValue.test(parseFloat(this.createTemp.yuanzhi)) || !rulesValue.test(parseFloat(this.createTemp.salvage)) || !rulesValue.test(parseFloat(this.createTemp.subtractvalue)) || !rulesValue.test(parseFloat(this.createTemp.yearUpkeepCost)) || !rulesValue.test(parseFloat(this.createTemp.yearMaintainCost))) {
+            if (!rulesValue.test(parseFloat(this.createTemp.yuanzhi))) {
+              this.$message({ type: 'error', message: '原值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.salvage))) {
+              this.$message({ type: 'error', message: '残值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.subtractvalue))) {
+              this.$message({ type: 'error', message: '月核减值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.yearUpkeepCost))) {
+              this.$message({ type: 'error', message: '保养费用输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.yearMaintainCost))) {
+              this.$message({ type: 'error', message: '维修费用请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+          }
+          PostDataByName(this.requestParam).then(response => {
+            console.log('新增保存发送参数', this.requestParam)
+            if (response.msg !== 'fail') {
+              if (this.getdataListParm.parammaps.inputDatetime === null) {
+                this.getdataListParm.parammaps.inputDatetime = ''
+              }
+              this.resetCreateTemp()
+              this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
+            } else {
+              failproccess(response, this.$notify)
+            }
+          })
+        }
+      })
+    },
+    form_edit(row) {
+      if (this.dialogFormVisible) {
+        return
+      }
+      this.edit = 0
+      this.getDepartParam.parammaps.pastureId = row.pastureId
+      this.getCreateDepartDownList()
+      this.createTemp = Object.assign({}, row) // copy obj
+      if (row.inputUser !== undefined) {
+        this.createTemp.inputUser = parseInt(row.inputUser)
+      }
+
+      if (this.createTemp.eqClassId !== undefined) {
+        this.defaultCheckedKeys = [this.createTemp.eqClassId]
+      } else {
+        this.createTemp.eqClassId = ''
+        this.defaultCheckedKeys = []
+      }
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['createTemp'].clearValidate()
+      })
+      const urlArray = []
+      const fileList = []
+      if (row.picpath == undefined) {
+        urlArray.push()
+      } else if (row.picpath == '') {
+        urlArray.push()
+      } else {
+        urlArray.push(row.picpath)
+      }
+      for (let i = 0; i < urlArray.length; i++) {
+        const urlObj = {}
+        this.$set(urlObj, 'url', urlArray[i])
+        fileList.push(urlObj)
+      }
+      this.$set(this.createTemp, 'fileList', fileList)
+      console.log(this.createTemp)
+      if (this.createTemp.fileList.length >= 1) {
+        this.showUpload = true
+      } else {
+        this.showUpload = false
+      }
+    },
+    edit_dialog_save() {
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          console.log('-----------', this.createTemp)
+          console.log(this.createTemp.providerId)
+          if (this.createTemp.eqClassId == '' || this.createTemp.eqClassId == undefined || this.createTemp.eqClassId == null) {
+            this.$message({ type: 'warning', message: '请选择设备类别' })
+          } else {
+            this.requestParam.name = 'updateAsset'
+            this.requestParam.parammaps = this.createTemp
+            if (this.createTemp.status === '正常') { this.createTemp.status = 17 }
+            if (this.createTemp.status === '闲置') { this.createTemp.status = 18 }
+            if (this.createTemp.status === '报废') { this.createTemp.status = 19 }
+            if (this.createTemp.status === '封存') { this.createTemp.status = 20 }
+            if (this.createTemp.providerId === '' || this.createTemp.providerId === undefined) { this.createTemp.providerId = 0 }
+            if (this.createTemp.brandId === '' || this.createTemp.brandId == undefined) { this.createTemp.brandId = 0 }
+            if (this.createTemp.yuanzhi === '') { this.createTemp.yuanzhi = 0 }
+            if (this.createTemp.salvage === '') { this.createTemp.salvage = 0 }
+            if (this.createTemp.subtractvalue === '') { this.createTemp.subtractvalue = 0 }
+            if (this.createTemp.yearUpkeepCost === '') { this.createTemp.yearUpkeepCost = 0 }
+            if (this.createTemp.yearMaintainCost === '') { this.createTemp.yearMaintainCost = 0 }
+            if (this.createTemp.baseHours === '') { this.createTemp.baseHours = 0 }
+            if (this.createTemp.upkeepgrade === 'A' || this.createTemp.upkeepgrade === 'B' || this.createTemp.upkeepgrade === 'C') {
+              this.createTemp.upkeepgrade = this.createTemp.upkeepgradeId
+              this.createTemp.upkeepgradeId = ''
+            }
+            this.createTemp.deptId = this.createTemp.deptId
+            this.createTemp.departmentName = this.createTemp.departmentName
+            this.createTemp.employeeId = this.createTemp.employeId
+            // var rulesValue = /^\d+(\.\d{1,3})?$/
+            this.requestParam.parammaps = this.createTemp
+            if (this.tabName === 'first') {
+              this.requestParam.parammaps.SHStatus = this.createTemp.SHStatus
+            } else if (this.tabName === 'second') {
+              this.requestParam.parammaps.SHStatus = 0
+            }
+            const picpath = parseInt(this.createTemp.picpath)
+            if (isNaN(picpath) == false) {
+              this.requestParam.parammaps.picpath = this.createTemp.picpath
+            } else {
+              this.requestParam.parammaps.picpath = this.createTemp.picId
+            }
+            PostDataByName(this.requestParam).then(response => {
+              console.log(response)
+              if (response.msg !== 'fail') {
+                if (this.getdataListParm.parammaps.inputDatetime1 === null) {
+                  this.getdataListParm.parammaps.inputDatetime1 = ''
+                }
+                this.get_table_data()
+                this.get_table_dataSH()
+                this.dialogFormVisible = false
+                this.$notify({ title: '成功', message: '保存成功-', type: 'success', duration: 2000 })
+                // this.reload()
+              } else {
+                failproccess(response, this.$notify)
+              }
+            })
+          }
+        }
+      })
+    },
+    brandSearch(queryString, cb) {
+      console.log('品牌模糊查询输入值', queryString)
+      this.requestBrand.parammaps['brandName'] = queryString
+      GetDataByName(this.requestBrand).then(response => {
+        console.log('品牌模糊查询搜索data', response.data.list)
+        this.BrandList = response.data.list
+        cb(this.BrandList)
+      })
+    },
+    handleSelectBrand(item) {
+      console.log('品牌模糊查询选中值', item)
+      this.$set(this.createTemp, 'brandName', item.brandName)
+      this.$set(this.createTemp, 'brandId', item.brandId)
+      this.$forceUpdate()
+    },
+    employeSearch(queryString, cb) {
+      console.log('责任人模糊查询输入值', queryString)
+      this.requestEmploye.parammaps['empname'] = queryString
+      GetDataByName(this.requestEmploye).then(response => {
+        console.log('责任人模糊查询搜索data', response.data.list)
+        this.employeList = response.data.list
+        cb(this.employeList)
+      })
+    },
+    handleSelectEmploye(item) {
+      console.log('责任人模糊查询选中值', item)
+      this.$set(this.createTemp, 'employeId', item.id)
+      this.$set(this.createTemp, 'employeName', item.name)
+      this.$forceUpdate()
+    },
+    form_see(row) {
+      console.log(row)
+      this.seeTemp = Object.assign({}, row) // copy obj
+      this.activeName = 'first'
+      this.dialogStatus = 'card'
+      this.dialogFormVisible_See = true
+      // 流程图
+      var reason = '未通过原因:' + this.seeTemp.workflowNote
+      if (this.seeTemp.SHStatus === 0) {
+        this.activeList = [{ title: '提交信息', date: this.seeTemp.inputDatetime, name: this.seeTemp.inputUserName }, { title: '设备中心审核' }]
+        this.active = 1
+      } else if (this.seeTemp.SHStatus === 1) {
+        this.activeList = [{ title: '提交信息', date: this.seeTemp.inputDatetime, name: this.seeTemp.inputUserName }, { title: '设备中心审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson }]
+        this.active = 2
+      } else if (this.seeTemp.SHStatus === 2) {
+        this.activeList = [{ title: '提交信息', date: this.seeTemp.inputDatetime, name: this.seeTemp.inputUserName }, { title: '设备中心审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson, status: 'error', reason: reason }]
+        this.active = 2
+      }
+      // 查看-点检记录
+    },
+    form_seeTabClick(val) {
+      console.log(val)
+      if (val.name == 'second') {
+        this.getAssetBigSpotCheckList()
+      } else if (val.name == 'third') {
+        this.getBigupkeepbyeqList()
+      } else if (val.name == 'fouth') {
+        this.getAssetMaintainList()
+      } else if (val.name == 'fifth') {
+        this.getAssetSTTList()
+      } else if (val.name == 'sixth') {
+        this.getAssetChangeList()
+      } else if (val.name == 'seventh') {
+        this.getAssetPartApplyList()
+      } else if (val.name == 'eighth') {
+        this.getBarChart1Parm.parammaps.eqId = this.seeTemp.id
+        this.getBarChart2Parm.parammaps.eqId = this.seeTemp.id
+        this.getChartSeeParm.parammaps.eqId = this.seeTemp.id
+
+        this.getBarChart1()
+        this.getBarChart2()
+      }
+    },
+    // 点检记录
+    getAssetBigSpotCheckList() {
+      this.listLoadingSpotCheck1 = true
+      if (this.$refs['inputDatetimeCheck1'] !== undefined && this.$refs['inputDatetimeCheck1'].value !== null) {
+        this.getAssetBigSpotCheckListParm.parammaps.startTime = this.$refs['inputDatetimeCheck1'].value[0]
+        this.getAssetBigSpotCheckListParm.parammaps.stopTime = this.$refs['inputDatetimeCheck1'].value[1]
+      } else {
+        this.getAssetBigSpotCheckListParm.parammaps.startTime = ''
+        this.getAssetBigSpotCheckListParm.parammaps.stopTime = ''
+      }
+      this.getAssetBigSpotCheckListParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetBigSpotCheckListParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetBigSpotCheckListParm).then(response => {
+        console.log('点检记录-table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listSpotCheck1 = response.data.list
+          this.pageNumSpotCheck1 = response.data.pageNum
+          this.pageSizeSpotCheck1 = response.data.pageSize
+        } else {
+          this.listSpotCheck1 = []
+        }
+        this.totalSpotCheck1 = response.data.total
+        setTimeout(() => {
+          this.listLoadingSpotCheck1 = false
+        }, 100)
+      })
+    },
+    form_searchSportCheck() {
+      if (this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 == null) {
+        this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 = ''
+      }
+      this.getAssetBigSpotCheckListParm.offset = 1
+      this.getAssetBigSpotCheckList()
+    },
+    // 保养记录
+    getBigupkeepbyeqList() {
+      this.listLoadingSpotCheck1 = true
+      if (this.$refs['inputDatetimeUpkeepbyeq'] !== undefined && this.$refs['inputDatetimeUpkeepbyeq'].value !== null) {
+        this.getBigupkeepbyeqParm.parammaps.startTime = this.$refs['inputDatetimeUpkeepbyeq'].value[0]
+        this.getBigupkeepbyeqParm.parammaps.stopTime = this.$refs['inputDatetimeUpkeepbyeq'].value[1]
+      } else {
+        this.getBigupkeepbyeqParm.parammaps.startTime = ''
+        this.getBigupkeepbyeqParm.parammaps.stopTime = ''
+      }
+      this.getBigupkeepbyeqParm.parammaps.assetId = this.seeTemp.assetId
+      this.getBigupkeepbyeqParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getBigupkeepbyeqParm).then(response => {
+        console.log('保养记录-table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listUpkeepbyeq = response.data.list
+          this.pageNumUpkeepbyeq = response.data.pageNum
+          this.pageSizeUpkeepbyeq = response.data.pageSize
+        } else {
+          this.listUpkeepbyeq = []
+        }
+        this.totalUpkeepbyeq = response.data.total
+        setTimeout(() => {
+          this.listLoadingSpotCheck1 = false
+        }, 100)
+      })
+    },
+    form_searchUpkeepbyeq() {
+      if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq === null) {
+        this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq = ''
+      }
+      this.getBigupkeepbyeqParm.offset = 1
+      this.getBigupkeepbyeqList()
+    },
+    // 维修记录
+    getAssetMaintainList() {
+      this.listLoadingAssetMaintain = true
+      if (this.$refs['inputDatetimeAssetMaintain'] !== undefined && this.$refs['inputDatetimeAssetMaintain'].value !== null) {
+        this.getAssetMaintainParm.parammaps.startTime = this.$refs['inputDatetimeAssetMaintain'].value[0]
+        this.getAssetMaintainParm.parammaps.stopTime = this.$refs['inputDatetimeAssetMaintain'].value[1]
+      } else {
+        this.getAssetMaintainParm.parammaps.startTime = ''
+        this.getAssetMaintainParm.parammaps.stopTime = ''
+      }
+      this.getAssetMaintainParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetMaintainParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetMaintainParm).then(response => {
+        console.log('维修记录-tabile数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listAssetMaintain = response.data.list
+          this.pageNumAssetMaintain = response.data.pageNum
+          this.pageSizeAssetMaintain = response.data.pageSize
+        } else {
+          this.listAssetMaintain = []
+        }
+
+        this.totalAssetMaintain = response.data.total
+
+        setTimeout(() => {
+          this.listLoadingAssetMaintain = false
+        }, 100)
+      })
+    },
+    form_searchAssetMaintain() {
+      if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan === null) {
+        this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan = ''
+      }
+      this.getBigupkeepbyeqParm.offset = 1
+      this.getAssetMaintainList()
+    },
+    // 启停记录
+    getAssetSTTList() {
+      this.listLoadingAssetSTT = true
+      this.getAssetSTTParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetSTTParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetSTTParm).then(response => {
+        console.log('启停记录-tabile数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listAssetSTT = response.data.list
+          this.pageNumAssetSTT = response.data.pageNum
+          this.pageSizeAssetSTT = response.data.pageSize
+        } else {
+          this.listAssetSTT = []
+        }
+        this.totalAssetSTT = response.data.total
+        setTimeout(() => {
+          this.listLoadingAssetSTT = false
+        }, 100)
+      })
+    },
+    form_searchAssetSTT() {
+      if (this.getAssetSTTParm.parammaps.startTime == null) {
+        this.getAssetSTTParm.parammaps.startTime = ''
+      }
+      if (this.getAssetSTTParm.parammaps.stopTime == null) {
+        this.getAssetSTTParm.parammaps.stopTime = ''
+      }
+      this.getAssetSTTParm.offset = 1
+      this.getAssetSTTList()
+    },
+    // 变更记录
+    getAssetChangeList() {
+      this.listLoadingAssetChange = true
+      console.log(this.$refs['inputDatetimeAssetChange'])
+      if (this.$refs['inputDatetimeAssetChange'] !== undefined && this.$refs['inputDatetimeAssetChange'].value !== null) {
+        this.getAssetChangeParm.parammaps.startTime = this.$refs['inputDatetimeAssetChange'].value[0]
+        this.getAssetChangeParm.parammaps.stopTime = this.$refs['inputDatetimeAssetChange'].value[1]
+      } else {
+        this.getAssetChangeParm.parammaps.startTime = ''
+        this.getAssetChangeParm.parammaps.stopTime = ''
+      }
+      this.getAssetChangeParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetChangeParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetChangeParm).then(response => {
+        console.log('变更记录-tabile数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listAssetChange = response.data.list
+          this.pageNumAssetChange = response.data.pageNum
+          this.pageSizeAssetChange = response.data.pageSize
+        } else {
+          this.listAssetChange = []
+        }
+        this.totalAssetChange = response.data.total
+        setTimeout(() => {
+          this.listLoadingAssetChange = false
+        }, 100)
+      })
+    },
+    form_searchAssetChange() {
+      if (this.getAssetChangeParm.parammaps.inputDatetimeAssetChange === null) {
+        this.getAssetChangeParm.parammaps.inputDatetimeAssetChange = ''
+      }
+      this.getAssetChangeParm.offset = 1
+      this.getAssetChangeList()
+    },
+    changeStatue: function(cellValue) {
+      if (cellValue.changeStatue == 17) {
+        return '正常'
+      } else if (cellValue.changeStatue == 18) {
+        return '闲置'
+      } else if (cellValue.changeStatue == 19) {
+        return '报废'
+      } else if (cellValue.changeStatue == 20) {
+        return '封存'
+      }
+    },
+    // 备件领用记录
+    getAssetPartApplyList() {
+      this.listLoadingAssetChange = true
+      console.log(this.$refs['inputDatetimeAssetPartApply'].value)
+      if (this.$refs['inputDatetimeAssetPartApply'] !== undefined && this.$refs['inputDatetimeAssetPartApply'].value !== null && this.$refs['inputDatetimeAssetPartApply'].value !== '') {
+        this.getAssetPartApplyParm.parammaps.startTime = this.$refs['inputDatetimeAssetPartApply'].value[0]
+        this.getAssetPartApplyParm.parammaps.stopTime = this.$refs['inputDatetimeAssetPartApply'].value[1]
+      } else {
+        this.getAssetPartApplyParm.parammaps.startTime = ''
+        this.getAssetPartApplyParm.parammaps.stopTime = ''
+      }
+      this.getAssetPartApplyParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetPartApplyParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetPartApplyParm).then(response => {
+        console.log('备件领用记录-tabile数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listAssetPartApply = response.data.list
+          this.pageNumAssetPartApply = response.data.pageNum
+          this.pageSizeAssetPartApply = response.data.pageSize
+        } else {
+          this.listAssetPartApply = []
+        }
+        this.totalAssetPartApply = response.data.total
+        setTimeout(() => {
+          this.listLoadingAssetPartApply = false
+        }, 100)
+      })
+    },
+    form_searchAssetPartApply() {
+      this.listLoadingAssetChange = true
+      if (this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange == null) {
+        this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange = ''
+      }
+      this.getAssetPartApplyParm.offset = 1
+      this.getAssetPartApplyList()
+    },
+    getBarChart1() {
+      GetReportform(this.getBarChart1Parm).then(response => {
+        console.log('图1', response)
+        this.chart_data1 = response.data.chart_data
+        var repireCost = response.data.chart_data.repireCost
+        var upkeepCost = response.data.chart_data.upkeepCost
+        var totaltitle1 = 0
+        if (repireCost !== null || repireCost !== undefined) {
+          repireCost.forEach(function(item, index) {
+            console.log(parseFloat(item))
+            totaltitle1 = totaltitle1 + parseFloat(item)
+          })
+        }
+        var totaltitle2 = 0
+        if (upkeepCost !== null || upkeepCost !== undefined) {
+          upkeepCost.forEach(function(item, index) {
+            console.log(parseFloat(item))
+            totaltitle2 = totaltitle2 + parseFloat(item)
+          })
+        }
+        this.totaltitle = totaltitle1 + totaltitle2
+        this.roadBarChart1(this.chart_data1, this.totaltitle.toFixed(2))
+      })
+    },
+    roadBarChart1(chart_data1, totaltitle) {
+      console.log(chart_data1, totaltitle)
+      if (this.barChart1 != null) {
+        this.barChart1.dispose()
+      }
+      this.barChart1 = echarts.init(document.getElementById('barChart1'))
+      var option = {
+        title: { text: '年度费用统计（总费用:' + totaltitle + '元）', textStyle: { color: '#769cfc' }},
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为:'line' | 'shadow'
+          },
+          formatter: function(data) {
+            console.log(data.length)
+            var value = 0
+            let val = ''
+            if (data.length == 1) {
+              val += data[0].seriesName + ':' + data[0].data + '元<br/>'
+            } else {
+              value = (parseFloat(data[0].value) + parseFloat(data[1].value)).toFixed(2)
+              // eslint-disable-next-line no-unused-vars
+              val = data[0].name + '年设备总费用:' + value + '元' + '<br/>'
+              val += '维修费用:' + data[0].data + '元<br/>'
+              val += '保养费用:' + data[1].data + '元<br/>'
+            }
+            return val
+          }
+        },
+        legend: {
+          data: ['维修费用', '保养费用'],
+          x: 'right'
+        },
+        color: ['#769cfc', '#42b983'],
+        grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
+        xAxis: [
+          { type: 'category', data: this.chart_data1.year }
+        ],
+        yAxis: [
+          { type: 'value', name: '费用(元)' }
+        ],
+        series: [
+          { name: '维修费用', type: 'bar', barWidth: 60, stack: '广告', data: this.chart_data1.repireCost },
+          { name: '保养费用', type: 'bar', barWidth: 60, stack: '广告', data: this.chart_data1.upkeepCost }
+        ]
+      }
+      this.barChart1.setOption(option)
+      var that = this
+      window.onresize = function() {
+        that.barChart1.resize()
+      }
+      this.barChart1.on('click', function(param, i) {
+        console.log(param)
+        that.getBarChart2Parm.parammaps.receiveTime = param.name
+        that.getBarChart2()
+        that.getBarChart1()
+      })
+    },
+    getBarChart2() {
+      GetReportform(this.getBarChart2Parm).then(response => {
+        console.log('图2', response)
+        this.chart_data2 = response.data.chart_data
+        this.roadBarChart2(this.chart_data2)
+      })
+    },
+    roadBarChart2(chart_data1) {
+      if (this.barChart2 != null) {
+        this.barChart2.dispose()
+      }
+      this.barChart2 = echarts.init(document.getElementById('barChart2'))
+      var option = {
+        title: { text: this.getBarChart2Parm.parammaps.receiveTime + '年月度费用统计', textStyle: { color: '#769cfc' }},
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为:'line' | 'shadow'
+          },
+          formatter: function(data) {
+            console.log(data)
+            var value = 0
+            var val = ''
+            if (data.length == 1) {
+              val += data[0].seriesName + ':' + data[0].data + '元<br/>'
+            } else {
+              value = (parseFloat(data[0].value) + parseFloat(data[1].value)).toFixed(2)
+              val = data[0].name + '月设备总费用:' + value + '元' + '<br/>'
+              val += '维修费用:' + data[0].data + '元<br/>'
+              val += '保养费用:' + data[1].data + '元<br/>'
+            }
+            return val
+          }
+        },
+        legend: {
+          data: ['维修费用', '保养费用'],
+          x: 'right'
+        },
+        color: ['#769cfc', '#42b983'],
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          { type: 'category', data: this.chart_data2.months }
+        ],
+        yAxis: [
+          { type: 'value', name: '费用(元)' }
+        ],
+        series: [
+          { name: '维修费用', type: 'bar', stack: '广告', data: this.chart_data2.repireCost },
+          { name: '保养费用', type: 'bar', stack: '广告', data: this.chart_data2.upkeepCost }
+        ]
+      }
+      this.barChart2.setOption(option)
+      var that = this
+      window.onresize = function() {
+        that.barChart2.resize()
+      }
+      this.barChart2.on('click', function(param, i) {
+        console.log(param)
+        that.dialogFormVisible_ChartSee = true
+        that.dialogStatus = 'card'
+        that.getChartSeeParm.parammaps.receiveTime = param.name
+        that.getChartSeeList()
+        that.getBarChart1()
+        that.getBarChart2()
+      })
+    },
+    getChartSeeList() {
+      this.listLoadingChartSee = true
+      if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
+        this.getChartSeeParm.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
+        this.getChartSeeParm.parammaps.stopTime = this.$refs['inputDatetime2'].value[1]
+      } else {
+        this.getChartSeeParm.parammaps.startTime = ''
+        this.getChartSeeParm.parammaps.stopTime = ''
+      }
+      GetDataByName(this.getChartSeeParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listChartSee = response.data.list
+          this.pageNumChartSee = response.data.pageNum
+          this.pageSizeChartSee = response.data.pageSize
+          if (response.data.total) {
+            this.totalChartSee = response.data.total
+          }
+        } else {
+          this.listChartSee = []
+        }
+        setTimeout(() => {
+          this.listLoadingChartSee = false
+        }, 100)
+      })
+    },
+    form_searchChartSee() {
+      this.listLoadingChartSee = true
+      if (this.getChartSeeParm.parammaps.inputDatetime2 === null) {
+        this.getChartSeeParm.parammaps.inputDatetime2 = ''
+      }
+      this.getChartSeeParm.offset = 1
+      this.getChartSeeList()
+    },
+ 
+    form_delete(row) {
+      MessageBox.confirm('确认删除此信息?', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.requestParam.name = 'deleteAsset'
+        this.requestParam.parammaps = {}
+        this.requestParam.parammaps['id'] = row.id
+        PostDataByName(this.requestParam).then(() => {
+          if (this.getdataListParm.parammaps.inputDatetime1 === null) {
+            this.getdataListParm.parammaps.inputDatetime1 = ''
+          }
+          this.get_table_data()
+        
+          this.dialogFormVisible = false
+          this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+        })
+      }).catch(() => {
+        this.$message({ type: 'info', message: '已取消删除' })
+      })
+    },
+    getDownClassList() {
+      getRecuData(this.getRecuListParm).then(response => {
+        this.parentClass = response.data
+      })
+    },
+
+    getEQNumber() {
+      this.getdataEQNumber.parammaps.pastureId = Cookies.get('pastureid')
+      GetDataByName(this.getdataEQNumber).then(response => {
+
+        
+        this.createTemp.assetCode = response.data.list[0].createNumber
+        console.log(response.data.list[0].createNumber)
+        console.log(this.createTemp.assetCode)
+        this.$forceUpdate()
+        
+      })
+    },
+
+   
+ 
+    changeSHStatue(val) {
+      if (val == 2) {
+        this.statueReason = true
+      } else {
+        this.statueReason = false
+      }
+    },
+   
+ 
+   
+   
+    changeBatchDept(item) {
+      console.log(item)
+      this.batchChange.getdataListParmPerson.parammaps.deptId = item
+      this.batchChange.temp.employeeId = ''
+      this.batchChange.getdataListParmPerson.parammaps.pastureId = this.batchChange.deptList.find(obj => obj.deptid == item).pastureId
+      this.getBatchChangePersonDownList()
+    },
+    getBatchChangePersonDownList() {
+      GetDataByName(this.batchChange.getdataListParmPerson).then(response => {
+        if (response.data.list !== null) {
+          this.batchChange.personList = response.data.list
+        } else {
+          this.batchChange.personList = []
+        }
+      })
+    },
+    changeBatchPerson(item) {
+      console.log(item)
+      this.batchChange.temp.employeeId = item
+      this.batchChange.temp.employeName = this.batchChange.personList.find(obj => obj.id == item).empname
+      this.$forceUpdate()
+    },
+    changeData() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['batchChangeTemp'].validate(valid => {
+        if (valid) {
+          this.requestParam = {}
+          var array = []
+          for (let i = 0; i < this.selectionList.length; i++) {
+            var obj = {}
+            var parammaps = {}
+            obj.name = 'updateEquipmentALL'
+            obj.offset = 0
+            obj.pagecount = 0
+            parammaps.departmentId = this.batchChange.temp.departmentId
+            parammaps.employeeId = this.batchChange.temp.employeeId
+            parammaps.employeName = this.batchChange.temp.employeName
+            parammaps.id = this.selectionList[i].id
+            obj.parammaps = parammaps
+            array.push(obj)
+          }
+          this.requestParam.array = array
+          PostDataByNames(this.requestParam).then(response => {
+            if (response.msg !== 'fail') {
+              this.dialogFormVisible_change = false
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.get_table_data()
+            } else {
+              failproccess(response, this.$notify)
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .el-autocomplete-suggestion li{
+    padding:0 3px!important;
+  }
+  .el-table .warning-row {
+      background: oldlace;
+  }
+  .el-table .success-row {
+      background: #f0f9eb;
+  }
+</style>
+<style lang="scss">
+  .upkeepgrade .el-form-item__label{
+    line-height: 20px;
+  }
+  .inputDatetime .el-range-separator{
+   padding: 0;
+   margin: 0 10px;
+  }
+  .el-radio__label{
+    padding-left: 2px !important;
+  }
+</style>
+<style>
+  .el-table .goBeyond { background: #F47C7C ; }
+  .el-table .warning { background: #989DF0; }
+  .el-table .scrap { background: #D7D7D7; }
+</style>

src/views/asset/assetDesignee/index1.vue

@@ -0,0 +1,2390 @@
+<template>
+  <div class="app-container">
+    这个页面取消，暂停开发T T
+    <div v-if="isPercentage" class="percentage" style="width: 210px;height: 90px;background: #fff;position: fixed;bottom: 0;left: 0;z-index: 9999999999999;">
+      <h4 style="padding-left: 10px;line-height: 0;">导出进度:</h4>
+      <el-progress style="padding-left: 10px;" :text-inside="true" :stroke-width="26" :percentage="percentage" />
+    </div>
+ 
+        <div class="filter-container">
+          <el-select v-model="getdataListParm.parammaps.pastureName" placeholder="牧场" class="filter-item" style="width: 120px;" @change="changePastureName">
+            <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+          </el-select>
+          <tree-select
+            v-model="getdataListParm.parammaps.eqClassId"
+            :height="150"
+            :width="250"
+            class="typeSelect"
+            size="small"
+            :data="parentClass"
+            :default-props="defaultProps"
+            :node-key="nodeKey"
+            clearable
+            :disabled="disabled"
+             placeholder="请选择设备类别"
+            :checked-keys="defaultCheckedKeys"
+            style="display: inline-block;"
+            @popoverHide="popoverHide"
+          />
+ 
+          <el-input v-model="getdataListParm.parammaps.eqCode" placeholder="指定维修人" clearable style="width: 150px;" class="filter-item" />
+          
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
+          <div>
+            <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-button  v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
+            </el-upload>
+
+        
+          </div>
+          <el-table
+            :key="tableKey"
+            v-loading="listLoading"
+            element-loading-text="给我一点时间"
+            :data="list"
+            border
+            fit
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="cellStyle"
+            class="elTable"
+   
+            @sort-change="tableSort2"
+          >
+ 
+            <el-table-column label="序号" align="center" type="index" width="50px">
+              <template slot-scope="scope">
+                <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="牧场" align="center" prop="pastureName" />
+            <el-table-column label="部门" align="center" prop="deptName" />
+            <el-table-column label="资产名称" align="center" prop="eqName" />
+            <el-table-column label="指定维修人" align="center" prop="eqCode" />
+            <el-table-column label="一级督办" align="center" prop="specification" />
+            <el-table-column label="二级督办" align="center" prop="brandName" />
+            <el-table-column label="三级督办" align="center" prop="brandName" />
+            <el-table-column label="推送时间(分)" align="center" prop="brandName" />
+             
+            
+            <el-table-column label="折旧年限" sortable align="center" prop="depreciation" />
+            <el-table-column label="使用时长(年)" sortable align="center" prop="serviceDuration" />
+            <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">
+              <template slot-scope="{row}">
+                <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>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
+        </div>
+     
+
+    <!-- 新增 -->
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible"  v-show = "dialogFormVisible" :close-on-click-modal="false" width="90%">
+      <div class="app-add">
+        <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="115px" style="width: 90%;margin:0 auto 30px">
+          <el-row>
+            <el-col :span="10">
+              <el-form-item label="设备类别:" prop="eqClassId">
+                <tree-select
+                  v-model="createTemp.eqClassId"
+                  :height="200"
+                  :width="300"
+                  size="small"
+                  :data="parentClass"
+                  :default-props="defaultProps"
+                  :node-key="nodeKey"
+                  :disabled="disabled"
+                  :placeholder="placeholder"
+                  :checked-keys="defaultCheckedKeys"
+                  @popoverHide="popoverHide"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="资产编号:" prop="assetCode">
+                <el-input ref="assetCode" v-model="createTemp.assetCode" placeholder="请输入编号" disabled   />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="设备名称:" prop="eqName">
+                <el-input ref="eqName" v-model="createTemp.eqName" placeholder="请输入设备名称"  disabled/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="设备内部编号:" prop="eqCode">
+                <el-input ref="eqCode" v-model="createTemp.eqCode" placeholder="请输入设备内部编号" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="财务编号:" prop="financeCode">
+                <el-input ref="financeCode" v-model="createTemp.financeCode" placeholder="请输入财务编号" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="设备规格:" prop="specification">
+                <el-input ref="specification" v-model="createTemp.specification" placeholder="请输入设备规格" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="品牌:" prop="brandName">
+                <el-autocomplete v-model="createTemp.brandName" value-key="brandName" class="inline-input" :fetch-suggestions="brandSearch" placeholder="请输入品牌" style="width:100%;" @select="(value)=> {handleSelectBrand(value)}" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="供应商:" prop="providerId">
+                <el-select v-model="createTemp.providerId" filterable placeholder="请选择供应商" style="width:100%">
+                  <el-option v-for="item in findAllProvider" :key="item.id" clearable :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="用途:" prop="purpose">
+                <el-input ref="purpose" v-model="createTemp.purpose" placeholder="请输入用途" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="状态:" prop="status">
+                <el-select v-model="createTemp.status" placeholder="状态" class="filter-item">
+                  <el-option v-for="item in getDictByName" :key="item.id" :label="item.label" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="购置日期:" prop="purchaseDate">
+                <el-date-picker v-model="createTemp.purchaseDate" type="date" placeholder="选择日期" style="width:170px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="入场日期:" prop="entranceDate">
+                <el-date-picker v-model="createTemp.entranceDate" type="date" placeholder="选择日期" style="width:170px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="折旧年限:" prop="depreciation">
+                <el-input ref="depreciation" v-model="createTemp.depreciation" placeholder="请输入折旧年限" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="原值:" prop="yuanzhi">
+                <el-input ref="yuanzhi" v-model="createTemp.yuanzhi" placeholder="请输入原值" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="残值:" prop="salvage">
+                <el-input ref="salvage" v-model="createTemp.salvage" placeholder="请输入残值" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="月核减值:" prop="subtractvalue">
+                <el-input ref="subtractvalue" v-model="createTemp.subtractvalue" placeholder="请输入月核减值" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="保养级别:" prop="upkeepgrade">
+                <el-select ref="upkeepgrade" v-model="createTemp.upkeepgrade" placeholder="保养级别" class="filter-item" @visible-change="upkeepgradeChange" @change="changeUpkeepgrade">
+                  <el-option v-for="item in upkeepgrades" :key="item.id" :label="item.label" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="保养费用:" prop="yearUpkeepCost">
+                <el-input ref="yearUpkeepCost" v-model="createTemp.yearUpkeepCost" placeholder="请输入近一年保养费用" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="维修费用:" prop="yearMaintainCost">
+                <el-input ref="yearMaintainCost" v-model="createTemp.yearMaintainCost" placeholder="请输入近一年维修费用" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="基数(小时):" prop="baseHours">
+                <el-input ref="baseHours" v-model="createTemp.baseHours" placeholder="请输入基数" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="牧场:" prop="pastureId">
+                <el-select v-model="createTemp.pastureId" placeholder="牧场" class="filter-item" @change="changePasture">
+                  <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="部门:" prop="deptId">
+                <el-select v-model="createTemp.deptId" :disabled="disabled" placeholder="部门" class="filter-item" style="width: 100%;" @change="changeDepart">
+                  <el-option v-for="item in createDepartList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="责任人:" prop="employeName">
+                <el-autocomplete v-model="createTemp.employeName" value-key="empname" class="inline-input" :fetch-suggestions="employeSearch" placeholder="请输入责任人" style="width:100%;" @select="handleSelectEmploye">
+                  <template slot-scope="{ item }">
+                    <div class="name" style="display: inline;">{{ item.name }}</div>
+                  </template>
+                </el-autocomplete>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="录入人:" prop="inputUser">
+                <el-select v-model="createTemp.inputUser" placeholder="录入人" class="filter-item">
+                  <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="录入时间:" prop="inputDatetime">
+                <el-date-picker v-model="createTemp.inputDatetime" :picker-options="pickerOptions1" type="date" placeholder="录入时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:170px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="设备图片:">
+                <el-upload
+                  id="uploadPic"
+                  ref="upload"
+                  :limit="1"
+                  list-type="picture-card"
+                  :file-list="createTemp.fileList"
+                  :headers="headers"
+                  :action="uploadImageUrl"
+                  :auto-upload="true"
+                  :on-preview="handlePicPreview"
+                  :before-remove="beforeRemove"
+                  :class="{hide:showUpload}"
+                  :on-change="(file,fileList)=>{ return handlePicChange(file, fileList) }"
+                  :on-success="(response,file, fileList)=>{ return handlePicSuccess(response,file, fileList) }"
+                  :on-remove="(file, fileList)=>{ return handlePicRemove(file, fileList) }"
+                >
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible" append-to-body :width="width">
+                  <img :src="dialogImageUrl" alt="" @load="onLoad">
+                </el-dialog>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <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="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>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 查看 -->
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible_See" :close-on-click-modal="false" width="90%">
+      <div class="app-contentcard">
+        <div style="position: absolute;top:20px;left:150px;font:18px/24px '' ;color:#303133;">
+          <span style="margin:0 10px;">设备名称:{{ seeTemp.eqName }}</span>
+          <span>内部编号:{{ seeTemp.eqCode }}</span>
+        </div>
+        <div class="card">
+          <el-tabs v-model="activeName" @tab-click="form_seeTabClick">
+            <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-row>
+                  <el-form-item label="设备类别:" prop="eqClassName">
+                    <el-input ref="eqClassName" v-model="seeTemp.eqClassName" placeholder="请输入设备类别" disabled />
+                  </el-form-item>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="资产编号:" prop="assetCode">
+                      <el-input ref="assetCode" v-model="seeTemp.assetCode" placeholder="请输入资产编号" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="设备名称:" prop="eqName">
+                      <el-input ref="eqName" v-model="seeTemp.eqName" placeholder="请输入设备名称" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="设备内部编号:" prop="eqCode">
+                      <el-input ref="eqCode" v-model="seeTemp.eqCode" placeholder="请输入设备内部编号" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="财务编号:" prop="financeCode">
+                      <el-input ref="financeCode" v-model="seeTemp.financeCode" placeholder="请输入财务编号" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="设备规格:" prop="specification">
+                      <el-input ref="specification" v-model="seeTemp.specification" placeholder="请输入设备规格" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="品牌:" prop="brandName">
+                      <el-input ref="brandName" v-model="seeTemp.brandName" placeholder="请输入品牌" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="供应商:" prop="providerName">
+                      <el-input ref="providerName" v-model="seeTemp.providerName" placeholder="请输入供应商" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="用途:" prop="purpose">
+                      <el-input ref="purpose" v-model="seeTemp.purpose" placeholder="请输入用途" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="状态:" prop="status">
+                      <el-input ref="status" v-model="seeTemp.status" placeholder="请输入状态" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="购置日期:" prop="purchaseDate">
+                      <el-input ref="purchaseDate" v-model="seeTemp.purchaseDate" placeholder="请输入购置日期" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="入场日期:" prop="entranceDate">
+                      <el-input ref="entranceDate" v-model="seeTemp.entranceDate" placeholder="请输入入场日期" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="折旧年限:" prop="depreciation">
+                      <el-input ref="depreciation" v-model="seeTemp.depreciation" placeholder="请输入折旧年限" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="原值:" prop="yuanzhi">
+                      <el-input ref="yuanzhi" v-model="seeTemp.yuanzhi" placeholder="请输入原值" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="残值:" prop="salvage">
+                      <el-input ref="salvage" v-model="seeTemp.salvage" placeholder="请输入残值" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="月核减值:" prop="subtractvalue">
+                      <el-input ref="subtractvalue" v-model="seeTemp.subtractvalue" placeholder="请输入月核减值" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="保养级别:" prop="upkeepgrade">
+                      <el-input ref="upkeepgrade" v-model="seeTemp.upkeepgrade" placeholder="请输入保养级别" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="保养费用:" prop="yearUpkeepCost">
+                      <el-input ref="yearUpkeepCost" v-model="seeTemp.yearUpkeepCost" placeholder="请输入近一年保养费用" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="维修费用:" prop="yearMaintainCost">
+                      <el-input ref="yearMaintainCost" v-model="seeTemp.yearMaintainCost" placeholder="请输入近一年维修费用" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="基数(小时):" prop="baseHours">
+                      <el-input ref="baseHours" v-model="seeTemp.baseHours" placeholder="请输入基数" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="牧场:" prop="pastureName">
+                      <el-input ref="pastureName" v-model="seeTemp.pastureName" placeholder="请输入牧场" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="6">
+                    <el-form-item label="部门:" prop="deptName">
+                      <el-input ref="deptName" v-model="seeTemp.deptName" placeholder="请输入部门" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="责任人:" prop="employeName">
+                      <el-input ref="employeName" v-model="seeTemp.employeName" placeholder="请输入责任人" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="录入人:" prop="inputUserName">
+                      <el-input ref="inputUserName" v-model="seeTemp.inputUserName" placeholder="请输入录入人" disabled />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="录入时间:" prop="inputDatetime">
+                      <el-input ref="inputDatetime" v-model="seeTemp.inputDatetime" placeholder="请输入录入时间" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col>
+                    <el-form-item label="设备图片:">
+                      <el-popover placement="right" title="" trigger="hover">
+                        <img v-if="seeTemp.picpath !== '' && seeTemp.srcpath !== ''" :src="seeTemp.picpath">
+                        <img v-if="seeTemp.picpath !== '' && seeTemp.srcpath !== ''" slot="reference" :src="seeTemp.picpath" :alt="seeTemp.srcpath" style="height: 100px;width:100px;">
+                      </el-popover>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <div v-if="isFlowChart">
+                  <el-row>
+                    <el-col>
+                      <el-form-item label="流程进度" />
+                      <el-steps :active="active" align-center finish-status="success">
+                        <el-step
+                          v-for="(item,index) in activeList"
+                          :key="index"
+                          :title="item.title"
+                          :status="item.status"
+                        >
+                          <template slot="description">
+                            <div class="step-row">
+                              <div>{{ item.name }}&nbsp;&nbsp;{{ item.date }}</div>
+                              <div>{{ item.reason }}</div>
+                            </div>
+                          </template>
+                        </el-step>
+                      </el-steps>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col>
+                      <el-form-item label="操作:">
+                        
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </div>
+              </el-form>
+            </el-tab-pane>
+            <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-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchSportCheck">搜索</el-button>
+              <el-table
+                :key="tableKey"
+                v-loading="listLoadingSpotCheck1"
+                element-loading-text="给我一点时间"
+                :data="listSpotCheck1"
+                border
+                fit
+                highlight-current-row
+                style="width: 100%;"
+                :row-style="rowStyle"
+                :cell-style="cellStyle"
+                class="elTable"
+              >
+                <el-table-column label="序号" align="center" type="index" width="50px">
+                  <template slot-scope="scope">
+                    <span>{{ scope.$index + (pageNumSpotCheck1-1) * pageSizeSpotCheck1 + 1 }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="点检结果" sortable prop="inspectionResults" min-width="110px" align="center" />
+                <el-table-column label="点检日期" sortable prop="date" min-width="110px" align="center" />
+                <el-table-column label="点检人" sortable prop="empname" min-width="110px" align="center" />
+              </el-table>
+              <pagination v-show="total>=0" :total="totalSpotCheck1" :page.sync="getAssetBigSpotCheckListParm.offset" :limit.sync="getAssetBigSpotCheckListParm.pagecount" @pagination="getAssetBigSpotCheckList" />
+            </el-tab-pane>
+            <el-tab-pane v-if="isDisplayRecord" label="保养记录" name="third">
+              <el-input v-model="getBigupkeepbyeqParm.parammaps.upkeepCode" placeholder="保养单号" style="width: 140px;" class="filter-item" />
+              <el-select v-model="getBigupkeepbyeqParm.parammaps.upkeepType" clearable placeholder="保养类型" class="filter-item" style="width: 120px;">
+                <el-option v-for="item in maintainTypes" :key="item.id" :label="item.name" :value="item.name" />
+              </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-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchUpkeepbyeq">搜索</el-button>
+              <el-table
+                :key="tableKey"
+                v-loading="listLoadingUpkeepbyeq"
+                element-loading-text="给我一点时间"
+                :data="listUpkeepbyeq"
+                border
+                fit
+                highlight-current-row
+                style="width: 100%;"
+                :row-style="rowStyle"
+                :cell-style="cellStyle"
+                class="elTable"
+                @sort-change="tableSort"
+              >
+                <el-table-column label="序号" align="center" type="index" width="50px">
+                  <template slot-scope="scope">
+                    <span>{{ scope.$index + (pageNumUpkeepbyeq-1) * pageSizeUpkeepbyeq + 1 }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="保养单号" prop="upkeepCode" min-width="110px" align="center" />
+                <el-table-column label="保养日期" sortable prop="plantime" min-width="110px" align="center" />
+                <el-table-column label="保养名称" prop="upkeepName" min-width="110px" align="center" />
+                <el-table-column label="保养类型" prop="upkeepType" min-width="110px" align="center" />
+                <el-table-column label="保养级别" prop="upkeepLevel" min-width="110px" align="center" />
+                <el-table-column label="保养人" prop="upkeepPerson" min-width="110px" align="center" />
+                <el-table-column label="保养费用" prop="upkeepCost" min-width="110px" align="center" />
+              </el-table>
+              <pagination v-show="total>=0" :total="totalUpkeepbyeq" :page.sync="getBigupkeepbyeqParm.offset" :limit.sync="getBigupkeepbyeqParm.pagecount" @pagination="getBigupkeepbyeqList" />
+            </el-tab-pane>
+            <el-tab-pane v-if="isDisplayRecord" label="维修记录" name="fouth">
+              <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-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetMaintain">搜索</el-button>
+              <el-table
+                :key="tableKey"
+                v-loading="listLoadingAssetMaintain"
+                element-loading-text="给我一点时间"
+                :data="listAssetMaintain"
+                border
+                fit
+                highlight-current-row
+                style="width: 100%;"
+                :row-style="rowStyle"
+                :cell-style="cellStyle"
+                class="elTable"
+                @sort-change="tableSort"
+              >
+                <el-table-column label="序号" align="center" type="index" width="50px">
+                  <template slot-scope="scope">
+                    <span>{{ scope.$index + (pageNumAssetMaintain-1) * pageSizeAssetMaintain + 1 }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="维修单号" prop="repairCode" min-width="110px" align="center" />
+                <el-table-column label="报修人" prop="requestName" min-width="110px" align="center" />
+                <el-table-column label="报修时间" sortable prop="requestTime" min-width="110px" align="center" />
+                <el-table-column label="维修人" prop="empname" min-width="110px" align="center" />
+                <el-table-column label="维修时间" sortable prop="stopTime" min-width="110px" align="center" />
+                <el-table-column label="诊断故障" prop="details" min-width="110px" align="center" />
+                <el-table-column label="维修费用" sortable prop="maintenanceCost" min-width="110px" align="center" />
+              </el-table>
+              <pagination v-show="total>=0" :total="totalAssetMaintain" :page.sync="getAssetMaintainParm.offset" :limit.sync="getAssetMaintainParm.pagecount" @pagination="getAssetMaintainList" />
+            </el-tab-pane>
+            <el-tab-pane v-if="isDisplayRecord" label="启停记录" name="fifth">
+              <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.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="form_searchAssetSTT">搜索</el-button>
+              </div>
+              <el-table
+                :key="tableKey"
+                v-loading="listLoadingAssetSTT"
+                element-loading-text="给我一点时间"
+                :data="listAssetSTT"
+                border
+                fit
+                highlight-current-row
+                style="width: 100%;"
+                :row-style="rowStyle"
+                :cell-style="cellStyle"
+                class="elTable"
+              >
+                <el-table-column label="序号" align="center" type="index" width="50">
+                  <template slot-scope="scope">
+                    <span>{{ scope.$index + (pageNumAssetSTT-1) * pageSizeAssetSTT + 1 }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="开启时间" sortable prop="enabledTime" min-width="110px" align="center" />
+                <el-table-column label="关闭时间" sortable prop="blockTime" min-width="110px" align="center" />
+                <el-table-column label="运行时间(分钟)" sortable prop="runTime" min-width="110px" align="center" />
+                <el-table-column label="关闭人" prop="blockName" min-width="110px" align="center" />
+              </el-table>
+              <pagination v-show="total>=0" :total="totalAssetSTT" :page.sync="getAssetSTTParm.offset" :limit.sync="getAssetSTTParm.pagecount" @pagination="getAssetSTTList" />
+            </el-tab-pane>
+            <el-tab-pane v-if="isDisplayRecord" label="变更记录" name="sixth">
+              <div class="filter-container">
+                <el-select v-model="getAssetChangeParm.parammaps.changeStatue" clearable placeholder="变更状态" class="filter-item" style="width: 120px;">
+                  <el-option v-for="item in changeStates" :key="item.id" :label="item.name" :value="item.id" />
+                </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-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchAssetChange">搜索</el-button>
+              </div>
+              <el-table
+                :key="tableKey"
+                v-loading="listLoadingAssetChange"
+                element-loading-text="给我一点时间"
+                :data="listAssetChange"
+                border
+                fit
+                highlight-current-row
+                style="width: 100%;"
+                :row-style="rowStyle"
+                :cell-style="cellStyle"
+                class="elTable"
+              >
+                <el-table-column label="序号" align="center" type="index" width="50px">
+                  <template slot-scope="scope">
+                    <span>{{ scope.$index + (pageNumAssetChange-1) * pageSizeAssetChange + 1 }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="变更时间" sortable prop="changeTime" min-width="110px" align="center" />
+                <el-table-column label="变更状态" :formatter="changeStatue" prop="blockTime" min-width="110px" align="center" />
+                <el-table-column label="变更人" prop="changeName" min-width="110px" align="center" />
+              </el-table>
+              <pagination v-show="total>=0" :total="totalAssetChange" :page.sync="getAssetChangeParm.offset" :limit.sync="getAssetChangeParm.pagecount" @pagination="getAssetChangeList" />
+            </el-tab-pane>
+            <el-tab-pane v-if="isDisplayRecord" label="备件领用记录" name="seventh">
+              <el-input v-model="getAssetPartApplyParm.parammaps.useCode" 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-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="form_searchAssetPartApply">搜索</el-button>
+              <el-table
+                :key="tableKey"
+                v-loading="listLoadingAssetPartApply"
+                element-loading-text="给我一点时间"
+                :data="listAssetPartApply"
+                border
+                fit
+                highlight-current-row
+                style="width: 100%;"
+                :row-style="rowStyle"
+                :cell-style="cellStyle"
+                class="elTable"
+                @sort-change="tableSort"
+              >
+                <el-table-column label="序号" align="center" type="index" width="50px">
+                  <template slot-scope="scope">
+                    <span>{{ scope.$index + (pageNumAssetPartApply-1) * pageSizeAssetPartApply + 1 }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="出库单号" prop="useForm" min-width="110px" align="center" />
+                <el-table-column label="备件编号" sortable prop="partCode" min-width="110px" align="center" />
+                <el-table-column label="备件名称" prop="partName" min-width="110px" align="center" />
+                <el-table-column label="备件规格" prop="specification" min-width="110px" align="center" />
+                <el-table-column label="备件品牌" prop="brandName" min-width="110px" align="center" />
+                <el-table-column label="计量单位" prop="unit" min-width="110px" align="center" />
+                <el-table-column label="领用数量" sortable prop="useNumber" min-width="110px" align="center" />
+                <el-table-column label="实际出库数量" sortable prop="checkoutNumber" min-width="110px" align="center" />
+                <el-table-column label="单价" sortable prop="price" min-width="110px" align="center" />
+                <el-table-column label="总价" sortable prop="sumPrice" min-width="110px" align="center" />
+                <el-table-column label="领用部门" prop="departmentName" min-width="110px" align="center" />
+                <el-table-column label="领用时间" sortable prop="receiveTime" min-width="110px" align="center" />
+                <el-table-column label="距离上次时间(天)" sortable prop="dif" min-width="110px" align="center" />
+              </el-table>
+              <pagination v-show="total>=0" :total="totalAssetPartApply" :page.sync="getAssetPartApplyParm.offset" :limit.sync="getAssetPartApplyParm.pagecount" @pagination="getAssetPartApplyList" />
+            </el-tab-pane>
+            <el-tab-pane v-if="isDisplayRecord" label="费用统计" name="eighth">
+              <el-row>
+                <el-col :span="12">
+                  <div v-if="activeName==='eighth'" id="barChart1" style="width: 100%;height:400px;" />
+                </el-col>
+                <el-col :span="12">
+                  <div v-if="activeName==='eighth'" id="barChart2" style="width: 100%;height:400px;" />
+                </el-col>
+              </el-row>
+              <el-dialog :title="textMap[dialogStatus]" append-to-body :visible.sync="dialogFormVisible_ChartSee" :close-on-click-modal="false" width="80%">
+                <div class="app-contentSee">
+                  <div class="filter-container">
+                    <el-select v-model="getChartSeeParm.parammaps.useTypeV" placeholder="类型" clearable class="filter-item" style="width: 120px;">
+                      <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
+                    </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-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_searchChartSee">搜索</el-button>
+                 
+                  </div>
+                  <el-table
+                    :key="tableKey"
+                    v-loading="listLoadingChartSee"
+                    element-loading-text="给我一点时间"
+                    :data="listChartSee"
+                    border
+                    fit
+                    highlight-current-row
+                    style="width: 100%;"
+                    :row-style="rowStyle"
+                    :cell-style="cellStyle"
+                    class="elTable"
+                  >
+                    <el-table-column label="序号" align="center" type="index" width="50px">
+                      <template slot-scope="scope">
+                        <span>{{ scope.$index + (pageNumChartSee-1) * pageSizeChartSee + 1 }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="1" label="类型" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.useTypeV }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="2" label="单号" width="140px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.RUcode }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="3" label="领用日期" min-width="80px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.creatTime }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="4" label="领用部门" min-width="100px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.departmentName }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="5" label="备件编号" min-width="80px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.partCode }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="6" label="备件名称" min-width="80px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.partName }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="7" label="备件规格" min-width="80px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.specification }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="8" label="备件品牌" min-width="100px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.brandName }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="9" label="计量单位" min-width="80px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.unit }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="10" label="出库数量" min-width="110px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.checkoutNumber }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="11" label="退库数量" min-width="100px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.quitNumber }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="12" label="单价" min-width="110px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.price }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column :key="13" label="总价" min-width="110px" align="center">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.sumPrice }}</span>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <pagination v-show="totalChartSee>=0" :total="totalChartSee" :page.sync="getChartSeeParm.offset" :limit.sync="getChartSeeParm.pagecount" @pagination="getChartSeeList" />
+                </div>
+              </el-dialog>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+        <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:10px">
+          <el-button @click="dialogFormVisible_See = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+ 
+    <!-- 变更 -->
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible_change" :close-on-click-modal="false" width="30%">
+      <div class="app-change">
+        <el-form ref="batchChangeTemp" :rules="rules" :model="batchChange.temp" label-position="right" label-width="115px" style="width: 90%;margin:0 auto 30px" @click.native.prevent @submit.native.prevent>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="变更部门:" prop="departmentId">
+                <el-select v-model="batchChange.temp.departmentId" placeholder="变更部门" class="filter-item" style="width: 100%;" @change="changeBatchDept">
+                  <el-option v-for="item in batchChange.deptList" :key="item.deptid" :label="item.departmentName" :value="item.deptid" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="变更责任人:" prop="employeeId">
+                <el-select v-model="batchChange.temp.employeeId" placeholder="变更责任人" class="filter-item" style="width: 100%;" @change="changeBatchPerson">
+                  <el-option v-for="item in batchChange.personList" :key="item.id" :label="item.empname" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:10px">
+          <el-button type="primary" :disabled="isokDisable" @click="changeData()">保存并关闭</el-button>
+          <el-button @click="dialogFormVisible_change = false;">取消并关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import echarts from 'echarts'
+
+require('echarts/theme/macarons')
+// 引入
+import { GetDataByName, GetDataByNames, PostDataByName, PostDataByNames, getRecuData, checkButtons, ExecDataByConfig, failproccess, GetAccount, GetReportform } from '@/api/common'
+import waves from '@/directive/waves'
+import { parseTime, sortChange, json2excel } from '@/utils/index.js'
+import Pagination from '@/components/Pagination'
+import { MessageBox } from 'element-ui'
+import TreeSelect from '@/components/TreeSelect'
+import Cookies from 'js-cookie'
+import { getToken } from '@/utils/auth'
+export default {
+  inject: ['reload'],
+  name: 'AssetDesignee',
+  components: { Pagination, TreeSelect },
+  directives: { waves },
+  data() {
+    return {
+      isBasicsAdd: [], isBasicsCard: [], isBasicsUpdate: [], isBasicsDel: [], isBasicsDel2: [], isBasic: [], isBasicSH: [], isBasicExamine: [],
+      rules: {
+        // assetCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        eqName: [{ required: true, message: '必填', trigger: 'blur' }],
+        eqCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        financeCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        departmentId: [{ required: true, message: '必填', trigger: 'blur' }],
+        employeeId: [{ required: true, message: '必填', trigger: 'blur' }],
+        depreciation: [{ type: 'number', required: true, validator: (rule, value, callback) => {
+          if (!value) {
+            callback(new Error('不能为空'))
+          }
+          setTimeout(() => {
+            const re = /^[0-9]*[1-9][0-9]*$/ // /^[0-9]*[1-9][0-9]*$/
+            const rsCheck = re.test(value)
+            if (!rsCheck) {
+              callback(new Error('请输入正整数'))
+            } else {
+              callback()
+            }
+          }, 0)
+        }, trigger: 'blur' }]
+      },
+      placeholder:"请选择设备类别",
+      findAllBrand: [], findAllProvider: [],
+      findAllAssetType: [], findAllPasture: [], findAllDepart: [], findAllEmploye: [],
+      getDictByName: [], upkeepgrades: [], createDepartList: [],
+      statues: [{ id: '0', name: '审核中' }, { id: '1', name: '已通过' }, { id: '2', name: '未通过' }],
+      depreciationAlertList: [{ id: '0', name: '正常' }, { id: '1', name: '到期预警' }, { id: '2', name: '超期使用' }],
+      requestParams: [
+        { name: 'findAllBrand', offset: 0, pagecount: 0, params: [] },
+        { name: 'findAllProvider', offset: 0, pagecount: 0, params: [] },
+        { name: 'findAlllAssetProvider', offset: 0, pagecount: 0, params: [] },
+        { name: 'findAllAssetType', offset: 0, pagecount: 0, params: [] },
+        { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }},
+        { name: 'findAllEmploye', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid') }},
+        { name: 'getDictByName', offset: 0, pagecount: 0, params: ['资产状态'] },
+        { name: 'getdictbyname', offset: 0, pagecount: 0, params: ['保养级别'] }
+      ],
+      getDepartParam: { name: 'findAllDepart1', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid'), 'eId': Cookies.get('employeid') }},
+      disabled: false,  
+      nodeKey: 'id',
+      defaultCheckedKeys: [],
+      parentClass: [],
+      defaultProps: { children: 'children', label: 'typeName' },
+      getRecuListParm: { name: 'getAssetTypeList', idname: 'id', params: [-1] },
+      tableKey: 0,
+      list: [],
+      total: 0,
+      listLoading: true,
+      getdataListParm: {
+        name: 'getAssetList', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
+        parammaps: {proId:'',brandId:'', assetCode:'',eqCode: '', eqName: '', departmentId: '', pastureId: Cookies.get('pastureid'), pastureName: Cookies.get('pasturename'), status: '', inputDatetime1: '', startTime: '', stopTime: '', inputDatetime2: '', startTime2: '', stopTime2: '', inputDatetime3: '', startTime3: '', stopTime3: '', warning: '', eqClassId: '' }
+      },
+     
+      textMap: { update: '编辑', create: '新增', card: '查看设备信息', examine: '审核', change: '批量变更' },
+      dialogFormVisible: false,
+      dialogStatus: '',
+      pickerOptions1: {
+        disabledDate(time) {
+          return time.getTime() > Date.now()// 当天之前的时间可选
+        }
+      },
+
+      dialogImageUrl: '', dialogVisible: false,
+      fileList: [], showUpload: false,
+      headers: { optname: 'insertcustompic', id: 1, token: getToken() },
+      uploadImageUrl: process.env.VUE_APP_BASE_API + 'authdata/uploaderimage',
+      width: '',
+
+      createTemp: { inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), employeId: this.$store.state.user.employeid, inputUser: this.$store.state.user.employeid, deptId: this.$store.state.user.departmentid, departmentName: Cookies.get('departmentname'), pastureId: this.$store.state.user.pastureid, assetCode: '', eqClassName: '', eqClassId: '', eqCode: '', eqName: '', specification: '', providerName: '', brandName: '', financeCode: '', status: '正常', purpose: '', purchaseDate: parseTime(new Date(), '{y}-{m}-{d}'), entranceDate: parseTime(new Date(), '{y}-{m}-{d}'), yearUpkeepCost: '', yearMaintainDost: '', yuanzhi: '', baseHours: '', upkeepgrade: '', salvage: '', subtractvalue: '', yearMaintainCost: '', brandId: '', providerId: '', inputUserName: '', employeName: this.$store.state.user.employename, depreciation: '' },
+      requestParam: { name: 'insertAsset', offset: 0, pagecount: 0, parammaps: {}},
+      seeTemp: {},
+ 
+      dialogFormVisible_See: false,
+      activeName: 'first',
+
+      maintainTypes: [{ id: '0', name: '周保养' }, { id: '1', name: '月保养' }, { id: '2', name: '间隔保养' }],
+      changeStates: [{ id: '17', name: '正常' }, { id: '18', name: '闲置' }, { id: '19', name: '报废' }, { id: '20', name: '封存' }],
+
+      getdataEQNumber: { name: 'cerateEQNumber', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: {}},
+
+      dialoFormVisible_Examine: false,
+      examineTemp: { SHstatue: 1 },
+      statueReason: false,
+      activeList: [],
+      active: 3,
+      isFlowChart: false,
+      isDisplayRecord: false,
+      buttons: [],
+      // 查看-点检记录
+      getAssetBigSpotCheckListParm: { name: 'getAssetBigSpotCheck1', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { inputDatetimeSpotCheck1: '', startTime: '', stopTime: '' }},
+      listLoadingSpotCheck1: false,
+      listSpotCheck1: [],
+      totalSpotCheck1: 0,
+      // 查看-保养记录
+      getBigupkeepbyeqParm: { name: 'getBigupkeepbyeq', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { inputDatetimeUpkeepbyeq: '', startTime: '', stopTime: '', upkeepType: '', upkeepCode: '' }},
+      listLoadingUpkeepbyeq: false,
+      listUpkeepbyeq: [],
+      totalUpkeepbyeq: 0,
+      // 查看-维修记录
+      getAssetMaintainParm: { name: 'getAssetMaintain1', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { inputDatetimeAssetMaintain: '', startTime: '', stopTime: '', repairCode: '' }},
+      listLoadingAssetMaintain: false,
+      listAssetMaintain: [],
+      totalAssetMaintain: 0,
+      // 查看-启停记录
+      getAssetSTTParm: { name: 'getAssetSTT1', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { startTime: '', stopTime: '' }},
+      listLoadingAssetSTT: false,
+      listAssetSTT: [],
+      totalAssetSTT: 0,
+      // 查看-变更记录
+      getAssetChangeParm: { name: 'getAssetChange1', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { startTime: '', stopTime: '', changeStatue: '', inputDatetimeAssetChange: '' }},
+      listLoadingAssetChange: false,
+      listAssetChange: [],
+      totalAssetChange: 0,
+      // 查看-备件领用记录
+      getAssetPartApplyParm: { name: 'getAssetPartApply', page: 1, offset: 1, pagecount: 10, returntype: 'Map', parammaps: { startTime: '', stopTime: '', inputDatetimeAssetPartApply: '' }},
+      listLoadingAssetPartApply: false,
+      listAssetPartApply: [],
+      totalAssetPartApply: 0,
+      downLoadParm: {},
+      downLoadList: [],
+      requestBrand: {
+        name: 'getBrandByPartCode',
+        page: 0,
+        offset: 0,
+        pagecount: 10,
+        returntype: 'Map',
+        parammaps: {}
+      },
+      BrandList: [],
+      requestEmploye: {
+        name: 'findAllEmployeV2',
+        page: 0,
+        offset: 0,
+        pagecount: 10,
+        returntype: 'Map',
+        parammaps: {
+          pastureId: Cookies.get('pastureid')
+        }
+      },
+      employeList: [],
+      totaltitle: 0,
+      getBarChart1Parm: {
+        name: 'getReportEqCostYear',
+        parammaps: {}
+      },
+      barChart1: null,
+      chart_data1: {},
+      getBarChart2Parm: {
+        name: 'getReportEqCostMonth',
+        parammaps: {
+          receiveTime: new Date().getFullYear()
+        }
+      },
+      barChart2: null,
+      chart_data2: {},
+      dialogFormVisible_ChartSee: false,
+      getChartSeeParm: {
+        name: 'getEqPartuseDetailList',
+        page: 0,
+        offset: 0,
+        pagecount: 10,
+        returntype: 'Map',
+        parammaps: {
+          receiveTime: '',
+          eqId: '',
+          useTypeV: '',
+          inputDatetime2: '',
+          stopTime: '',
+          startTime: ''
+        }
+      },
+      listLoadingChartSee: false,
+      totalChartSee: 0,
+      listChartSee: [],
+      pageNum: 0,
+      pageSize: 0,
+      pageNumSH: 0,
+      pageSizeSH: 0,
+      useTypes: [{ id: 0, name: '维修' }, { id: 1, name: '保养' }],
+      downLoadParm2: {},
+      downLoadList2: [],
+      isPercentage: false,
+      percentage: 1,
+      isokDisable: false,
+      edit: 0,
+      selectionList: [],
+      dialogFormVisible_change: false,
+      batchChange: {
+        temp: { departmentId: '', employeeId: '' },
+        getdataListParmDept: { name: 'getAssetAndEmpList', offset: 0, pagecount: 0, parammaps: {}},
+        deptList: [],
+        getdataListParmPerson: { name: 'getAllEmp', offset: 0, pagecount: 0, parammaps: {}},
+        personList: []
+      },
+      rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
+      cellStyle: { padding: 0 + 'px' }
+    }
+  },
+  computed: {
+    // 设置请求头
+    // headers() {
+    //   return {
+    //     // 设置token
+    //     // eslint-disable-next-line no-undef
+    //     token: getToken()
+    //   }
+    // },
+    uploadData() {
+      return {
+        name: 'importStockUse',
+        importParams: '牧场,设备类别,资产编号,设备名称,设备内部编号,设备规格,品牌,供应商,用途,状态,购置日期,入场日期,折旧年限,财务编号,原值,残值,月核减值,保养级别,保养费用,维修费用,维修费用,基数(小时),部门,责任人,录入人,录入时间,使用时长(年),使用率(%),SignColumn',
+        sheetname: 'SheetJS'
+      }
+    },
+   
+    // 设置上传地址
+    uploadExcelUrl() {
+      // process.env.VUE_APP_BASE_API是服务器的路径，也是axios的基本路径
+      return process.env.VUE_APP_BASE_API + 'authdata/equipment'
+    }
+  },
+  created() {
+    const that = this
+    GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
+      that.buttons = response.data.list
+      that.get_auto_buttons()
+    })
+ 
+    this.getDownClassList()
+    this.getdataListParm.parammaps.pastureName = Cookies.get('pasturename')
+        this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
+ 
+
+    this.get_table_data()
+    // Window.addEventListener('keyup', )
+ 
+  },
+  methods: {
+     // 导入
+     beforeImportExcel(file) {
+      const isLt2M = file.size / 1024 / 1024 < 10
+      if (!isLt2M) {
+        this.$message.error('上传文件大小不能超过 10MB!')
+      }
+      return isLt2M
+    },
+    handleImportExcelSuccess(res, file) {
+      if (res.msg === 'ok') {
+        this.$message({
+          title: '成功',
+          message: '导入成功:' + res.data.success + '条!',
+          type: 'success',
+          duration: 2000
+        })
+        if (res.data.err_count > 0) {
+          this.$notify({
+            title: '失败',
+            message: '导入失败:' + res.data.err_count + '条!',
+            type: 'danger',
+            duration: 2000
+          })
+
+          
+        }
+      } else {
+        this.$notify({
+          title: '失败',
+          message: '上传失败',
+          type: 'danger',
+          duration: 2000
+        })
+      }
+    },
+    formatJsonTemp(filterVal, jsonData) {
+      return jsonData.map(v =>
+        filterVal.map(j => {
+          if (j === 'timestamp') {
+            return parseTime(v[j])
+          } else {
+            return v[j]
+          }
+        })
+      )
+    },
+    tableSort2(column) {
+      sortChange(column, this.list)
+    },
+    tableSort(column) {
+      if (this.activeName == 'third') {
+        sortChange(column, this.listUpkeepbyeq)
+      } else if (this.activeName == 'fouth') {
+        sortChange(column, this.listAssetMaintain)
+      } else if (this.activeName == 'seventh') {
+        sortChange(column, this.listAssetPartApply)
+      }
+    },
+    get_auto_buttons() {
+      // 新增
+      const BasicsAdd = 'asset:basics:add'
+      const isBasicsAdd = checkButtons(this.$store.state.user.buttons, BasicsAdd)
+      this.isBasicsAdd = isBasicsAdd
+      // 卡片
+      const BasicsCard = 'asset:basics:kapian'
+      const isBasicsCard = checkButtons(this.$store.state.user.buttons, BasicsCard)
+      this.isBasicsCard = isBasicsCard
+      // 编辑
+      const BasicsUpdate = 'asset:basics:update'
+      const isBasicsUpdate = checkButtons(this.$store.state.user.buttons, BasicsUpdate)
+      this.isBasicsUpdate = isBasicsUpdate
+      // 删除
+      const BasicsDel = 'asset:basics:del'
+      const isBasicsDel = checkButtons(this.$store.state.user.buttons, BasicsDel)
+      this.isBasicsDel = isBasicsDel
+      // 设备基础信息-删除
+      const BasicsDel2 = 'asset:basics:del2'
+      const isBasicsDel2 = checkButtons(this.$store.state.user.buttons, BasicsDel2)
+      this.isBasicsDel2 = isBasicsDel2
+      // 设备基础信息
+      const Basic = 'asset:basic:basic'
+      const isBasic = checkButtons(this.$store.state.user.buttons, Basic)
+      this.isBasic = isBasic
+      // 设备审核
+      const BasicSH = 'asset:basic:shjm'
+      const isBasicSH = checkButtons(this.$store.state.user.buttons, BasicSH)
+      this.isBasicSH = isBasicSH
+      // 审核
+      const BasicExamine = 'asset:basic:shenhe'
+      const isBasicExamine = checkButtons(this.$store.state.user.buttons, BasicExamine)
+      this.isBasicExamine = isBasicExamine
+    },
+    // 2-2:下拉框
+    get_select_list() {
+      GetDataByNames(this.requestParams).then(response => {
+        if (response.data.list !== null) {
+          this.findAllBrand = response.data.findAllBrand.list
+          this.findAllProvider = response.data.findAllProvider.list
+          this.findAllAssetType = response.data.findAllAssetType.list
+          this.findAllPasture = response.data.findAllPasture.list
+          this.findAllEmploye = response.data.findAllEmploye.list
+          this.getDictByName = response.data.getDictByName.list
+          this.upkeepgrades = response.data.getdictbyname.list
+          this.getDepartDownList()
+        }
+      })
+    },
+    getDepartDownList() {
+      GetDataByName(this.getDepartParam).then(response => {
+        this.findAllDepart = response.data.list
+      })
+    },
+    changePastureName(item) {
+      this.getDepartParam.parammaps.pastureId = this.findAllPasture.find(obj => obj.name == item).id
+      this.getdataListParm.parammaps.departmentId = ''
+      this.getDepartDownList()
+    },
+    getCreateDepartDownList() {
+      GetDataByName(this.getDepartParam).then(response => {
+        this.createDepartList = response.data.list
+        if (this.edit == 1) {
+          if (this.createDepartList.find(obj => obj.id == Cookies.get('departmentid'))) {
+            this.createTemp.departmentId = parseInt(Cookies.get('departmentid'))
+            this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == Cookies.get('departmentid')).name
+            this.createTemp.deptId = parseInt(Cookies.get('departmentid'))
+          } else {
+            this.createTemp.departmentId = response.data.list[0].id
+            this.createTemp.departmentId = response.data.list[0].id
+            this.createTemp.deptId = response.data.list[0].name
+          }
+        }
+      })
+    },
+    changePasture(item) {
+      this.getDepartParam.parammaps.pastureId = item
+      this.edit = 1
+      this.getCreateDepartDownList()
+    },
+    changeDepart(item) {
+      this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
+    },
+    get_table_data() {
+      this.listLoading = true
+      if (this.getdataListParm.parammaps.inputDatetime1 == null) {
+        this.getdataListParm.parammaps.inputDatetime1 = ''
+        this.getdataListParm.parammaps.startTime = ''
+        this.getdataListParm.parammaps.stopTime = ''
+      } else {
+        this.getdataListParm.parammaps.startTime = this.getdataListParm.parammaps.inputDatetime1[0]
+        this.getdataListParm.parammaps.stopTime = this.getdataListParm.parammaps.inputDatetime1[1]
+      }
+      if (this.getdataListParm.parammaps.inputDatetime2 == null || this.getdataListParm.parammaps.inputDatetime2 == '') {
+        this.getdataListParm.parammaps.inputDatetime2 = ''
+        this.getdataListParm.parammaps.startTime2 = ''
+        this.getdataListParm.parammaps.stopTime2 = ''
+      } else {
+        this.getdataListParm.parammaps.startTime2 = this.getdataListParm.parammaps.inputDatetime2[0]
+        this.getdataListParm.parammaps.stopTime2 = this.getdataListParm.parammaps.inputDatetime2[1]
+      }
+      if (this.getdataListParm.parammaps.inputDatetime3 == null || this.getdataListParm.parammaps.inputDatetime3 == '') {
+        this.getdataListParm.parammaps.inputDatetime3 = ''
+        this.getdataListParm.parammaps.startTime3 = ''
+        this.getdataListParm.parammaps.stopTime3 = ''
+      } else {
+        this.getdataListParm.parammaps.startTime3 = this.getdataListParm.parammaps.inputDatetime3[0]
+        this.getdataListParm.parammaps.stopTime3 = this.getdataListParm.parammaps.inputDatetime3[1]
+      }
+      GetDataByName(this.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.list = response.data.list
+           
+          this.pageNum = response.data.pageNum
+          this.pageSize = response.data.pageSize
+        } else {
+          this.list = []
+        }
+        this.total = response.data.total
+        setTimeout(() => {
+          this.listLoading = false
+        }, 100)
+        this.get_select_list()
+      })
+    },
+     
+    SHStatus: function(cellValue) {
+      if (cellValue.SHStatus == 0) {
+        return '审核中'
+      } else if (cellValue.SHStatus == 1) {
+        return '已通过'
+      } else if (cellValue.SHStatus == 2) {
+        return '未通过'
+      } else if (cellValue.SHStatus == 3) {
+        return '历史数据'
+      }
+    },
+    form_search() {
+      this.listLoading = true
+      this.getdataListParm.parammaps.pastureId = ''
+      if (this.getdataListParm.parammaps.warning !== '') {
+        this.getdataListParm.parammaps.d1 = 1
+      } else {
+        this.getdataListParm.parammaps.d1 = ''
+      }
+      if (this.getdataListParm.parammaps.inputDatetime1 == null) {
+        this.getdataListParm.parammaps.inputDatetime1 = ''
+        this.getdataListParm.parammaps.startTime = ''
+        this.getdataListParm.parammaps.stopTime = ''
+      } else {
+        this.getdataListParm.parammaps.startTime = this.getdataListParm.parammaps.inputDatetime1[0]
+        this.getdataListParm.parammaps.stopTime = this.getdataListParm.parammaps.inputDatetime1[1]
+      }
+      console.log(this.getdataListParm.parammaps.inputDatetime2)
+      if (this.getdataListParm.parammaps.inputDatetime2 == null) {
+        this.getdataListParm.parammaps.inputDatetime2 = ''
+        this.getdataListParm.parammaps.startTime2 = ''
+        this.getdataListParm.parammaps.stopTime2 = ''
+      } else {
+        this.getdataListParm.parammaps.startTime2 = this.getdataListParm.parammaps.inputDatetime2[0]
+        this.getdataListParm.parammaps.stopTime2 = this.getdataListParm.parammaps.inputDatetime2[1]
+      }
+      if (this.getdataListParm.parammaps.inputDatetime3 == null) {
+        this.getdataListParm.parammaps.inputDatetime3 = ''
+        this.getdataListParm.parammaps.startTime3 = ''
+        this.getdataListParm.parammaps.stopTime3 = ''
+      } else {
+        this.getdataListParm.parammaps.startTime3 = this.getdataListParm.parammaps.inputDatetime3[0]
+        this.getdataListParm.parammaps.stopTime3 = this.getdataListParm.parammaps.inputDatetime3[1]
+      }
+      this.getdataListParm.offset = 1
+      this.get_table_data()
+    },
+ 
+    handlePicChange(file, fileList) {
+      if (fileList.length > 0) {
+        this.$nextTick(() => {
+          this.showUpload = true
+        })
+      } else {
+        this.$nextTick(() => {
+          this.showUpload = false
+        })
+      }
+      console.log(this.createTemp)
+    },
+    handlePicSuccess(response, file, fileList) {
+      if (fileList.length > 0) {
+        this.$nextTick(() => {
+          this.showUpload = true
+        })
+      } else {
+        this.$nextTick(() => {
+          this.showUpload = false
+        })
+      }
+      if (this.createTemp.picpath === undefined || this.createTemp.picpath === '' || this.createTemp.picpath == -1) {
+        this.$set(this.createTemp, 'picpath', response.execresult.LastInsertId)
+      }
+    },
+    handlePicRemove(file, fileList) {
+      if (this.dialogStatus === 'create') {
+        if (fileList.length < 1) {
+          this.showUpload = false
+        }
+        for (const key in this.createTemp) {
+          if (this.createTemp[key] === file.response.execresult.LastInsertId) {
+            this.$delete(this.createTemp, key)
+          }
+        }
+      } else {
+        if (fileList.length < 1) {
+          this.$nextTick(() => {
+            this.showUpload = false
+          })
+        }
+        const url = file.url
+        console.log(url, 'url')
+        for (const key in this.createTemp) {
+          console.log(this.createTemp[key], 'createTemp[key]')
+          if (this.createTemp[key] === url) {
+            console.log(key)
+            if (key === 'picpath') {
+              this.$delete(this.createTemp, 'picpath')
+              this.$delete(this.createTemp, 'picId')
+            }
+          }
+        }
+      }
+      console.log(this.createTemp, '文件列表移除文件时的钩子row')
+    },
+    handlePicPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    onLoad(e) {
+      const img = e.target
+      let width = 0
+      if (img.fileSize > 0 || (img.width > 1 && img.height > 1)) {
+        width = img.width + 40
+      }
+      this.width = width + 'px'
+    },
+    add_dialog_saveAdd() {
+      console.log('点击了保存')
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          for (var i = 0; i < this.listAdd.length; i++) {
+            if (this.listAdd[i].score == null) {
+              this.$message({ type: 'warning', message: '请检查检查结果是否为空', duration: 2000 })
+              return false
+            }
+            if (this.listAdd[i].pic1 == undefined) {
+              this.listAdd[i].pic1 = -1
+            }
+            if (this.listAdd[i].pic2 == undefined) {
+              this.listAdd[i].pic2 = -1
+            }
+            if (this.listAdd[i].pic3 == undefined) {
+              this.listAdd[i].pic3 = -1
+            }
+          }
+          this.postDataPramas.common = { 'returnmap': '0' }
+          this.postDataPramas.data = []
+          this.postDataPramas.data[0] = { 'name': 'insertBigjudge', 'type': 'e', 'parammaps': {
+            pastureId: this.createTemp.pastureId,
+            batime: this.createTemp.batime,
+            empId: this.createTemp.empId
+          }}
+          this.postDataPramas.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.listAdd }}
+          this.postDataPramas.data[1].children = []
+          this.postDataPramas.data[1].children[0] = { 'name': 'insertjudge', 'type': 'e', 'parammaps': {
+            bigId: '@insertBigjudge.LastInsertId',
+            statue: '@insertSpotList.statue',
+            score: '@insertSpotList.score',
+            note: '@insertSpotList.note',
+            pic1: '@insertSpotList.pic1',
+            pic2: '@insertSpotList.pic2',
+            pic3: '@insertSpotList.pic3'
+          }}
+          ExecDataByConfig(this.postDataPramas).then(response => {
+            console.log('新增保存发送参数', this.postDataPramas)
+            if (response.msg === 'fail') {
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.getdataListParm.parammaps.inputDatetime = ''
+              this.get_table_data()
+              this.dialogFormVisibleAdd = false
+              this.createTemp.providerName = ''
+              this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+            }
+          })
+        }
+      })
+    },
+    beforeRemove(file, fileList) {
+      console.log(file.response, '删除文件之前的钩子，参数为上传的文件和文件列表')
+      return this.$confirm('删除当前图片, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' })
+    },
+    resetCreateTemp() {
+      this.defaultCheckedKeys = []
+      this.createTemp.defaultCheckedKeys = []
+      this.createTemp.brandId = ''
+      this.createTemp.providerId = ''
+      this.createTemp.inputDatetime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.createTemp.eqClassName = ''
+      this.createTemp.eqClassId = ''
+      this.createTemp.employeName = Cookies.get('employename')
+      this.createTemp.employeId = Cookies.get('employeid')
+      this.createTemp.inputUser = Cookies.get('employeid')
+      this.createTemp.deptId = parseInt(Cookies.get('departmentid'))
+      this.createTemp.departmentName = Cookies.get('departmentname')
+      this.createTemp.pastureId = parseInt(Cookies.get('pastureid'))
+      this.createTemp.eqCode = ''
+      this.createTemp.eqName = ''
+      this.createTemp.specification = ''
+      this.createTemp.providerName = ''
+      this.createTemp.financeCode = ''
+      this.createTemp.status = '正常'
+      this.createTemp.providerName = ''
+      this.createTemp.brandName = ''
+      this.createTemp.purpose = ''
+      this.createTemp.purchaseDate = parseTime(new Date(), '{y}-{m}-{d}')
+      this.createTemp.entranceDate = parseTime(new Date(), '{y}-{m}-{d}')
+      this.createTemp.assetCode = ''
+      this.createTemp.yearUpkeepCost = ''
+      this.createTemp.yearMaintainDost = ''
+      this.createTemp.yuanzhi = ''
+ 
+      this.createTemp.baseHours = ''
+      this.createTemp.upkeepgrade = 113
+      this.createTemp.salvage = ''
+      this.createTemp.subtractvalue = ''
+      this.createTemp.yearMaintainCost = ''
+      this.createTemp.inputUserName = ''
+      this.createTemp.picpath = ''
+      this.fileList = []
+      this.showUpload = false
+      this.createTemp.fileList = []
+      this.createTemp.depreciation = ''
+    },
+    form_add() {
+      this.resetCreateTemp()
+      this.edit = 1
+      this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
+      this.getCreateDepartDownList()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['createTemp'].clearValidate()
+      })
+    },
+    changeBrand(item) {
+      this.createTemp.brandName = this.findAllBrand.find(obj => obj.id === item).name
+    },
+    changeUpkeepgrade(item) {
+      console.log(item)
+    },
+    upkeepgradeChange(e) {
+      if (!e) {
+        this.$refs['upkeepgrade'].blur()
+      }
+    },
+    popoverHide(checkedIds, checkedData) {
+      console.log(checkedIds, checkedData)
+      if (checkedIds !== null) {
+        this.getdataEQNumber.parammaps.eqCode = checkedData.typeCode
+        // if (checkedData.children === undefined) {
+        //   this.createTemp.eqClassId = checkedData.eqClassId
+        //   this.createTemp.eqName = checkedData.NewName
+        //   this.getdataListParm.parammaps.eqClassId = checkedData.eqClassId
+        //   this.getEQNumber()
+        // } else {
+        //   this.defaultCheckedKeys = []
+        //   this.createTemp.eqClassId = ''
+        //   this.getdataListParm.parammaps.eqClassId = ''
+        //   this.$message({ type: 'warning', message: '请选择具体设备类型' })
+        // }
+        this.createTemp.eqClassId = checkedData.eqClassId
+          this.createTemp.eqName = checkedData.NewName
+          this.getdataListParm.parammaps.eqClassId = checkedData.eqClassId
+          this.getEQNumber()
+      } else {
+        this.defaultCheckedKeys = []
+        this.createTemp.eqClassId = ''
+        this.getdataListParm.parammaps.eqClassId = ''
+      }
+    },
+    add_dialog_save() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          console.log(this.createTemp)
+          this.requestParam.name = 'insertAsset'
+          if (this.createTemp.status == '正常') { this.createTemp.status = 17 }
+          if (this.createTemp.providerId == '') { this.createTemp.providerId = 0 }
+          if (this.createTemp.brandId == '') { this.createTemp.brandId = 0 }
+          if (this.createTemp.yuanzhi == '') { this.createTemp.yuanzhi = 0 }
+          if (this.createTemp.salvage == '') { this.createTemp.salvage = 0 }
+          if (this.createTemp.subtractvalue == '') { this.createTemp.subtractvalue = 0 }
+          if (this.createTemp.yearUpkeepCost == '') { this.createTemp.yearUpkeepCost = 0 }
+          if (this.createTemp.yearMaintainCost == '') { this.createTemp.yearMaintainCost = 0 }
+          if (this.createTemp.baseHours == '') { this.createTemp.baseHours = 0 }
+          // 原值yuanzhi残值salvage月核减值subtractvalue保养费用yearUpkeepCost维修费用yearMaintainCost
+          var rulesValue = /^\d+(\.\d{1,3})?$/
+          this.requestParam.parammaps = this.createTemp
+          this.requestParam.parammaps.picpath = this.createTemp.picpath
+          if (this.createTemp.yuanzhi !== '' || this.createTemp.salvage !== '' || this.createTemp.subtractvalue !== '' || this.createTemp.yearUpkeepCost !== '' || this.createTemp.yearMaintainCost !== '') {
+            this.requestParam.parammaps.yuanzhi = parseFloat(this.createTemp.yuanzhi)
+            if (!rulesValue.test(parseFloat(this.createTemp.yuanzhi))) {
+              this.$message({ type: 'error', message: '原值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.salvage))) {
+              this.$message({ type: 'error', message: '残值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.subtractvalue))) {
+              this.$message({ type: 'error', message: '月核减值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.yearUpkeepCost))) {
+              this.$message({ type: 'error', message: '保养费用输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.yearMaintainCost))) {
+              this.$message({ type: 'error', message: '维修费用请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+          }
+          PostDataByName(this.requestParam).then(response => {
+            console.log('新增保存发送参数', this.requestParam)
+            if (response.msg !== 'fail') {
+              if (this.getdataListParm.parammaps.inputDatetime1 === null) {
+                this.getdataListParm.parammaps.inputDatetime1 = ''
+              }
+              this.dialogFormVisible = false
+              this.get_table_data()
+              this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
+              // this.reload()
+            } else {
+              failproccess(response, this.$notify)
+            }
+          })
+        }
+      })
+    },
+    // 继续新增
+    add_dialog_save_again() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          this.requestParam.name = 'insertAsset'
+          if (this.createTemp.status == '正常') { this.createTemp.status = 17 }
+          if (this.createTemp.providerId == '') { this.createTemp.providerId = 0 }
+          if (this.createTemp.brandId == '') { this.createTemp.brandId = 0 }
+          if (this.createTemp.yuanzhi == '') { this.createTemp.yuanzhi = 0 }
+          if (this.createTemp.salvage == '') { this.createTemp.salvage = 0 }
+          if (this.createTemp.subtractvalue == '') { this.createTemp.subtractvalue = 0 }
+          if (this.createTemp.yearUpkeepCost == '') { this.createTemp.yearUpkeepCost = 0 }
+          if (this.createTemp.yearMaintainCost == '') { this.createTemp.yearMaintainCost = 0 }
+          if (this.createTemp.baseHours == '') { this.createTemp.baseHours = 0 }
+          // 原值yuanzhi残值salvage月核减值subtractvalue保养费用yearUpkeepCost维修费用yearMaintainCost
+          var rulesValue = /^\d+(\.\d{1,3})?$/
+          this.requestParam.parammaps = this.createTemp
+          this.requestParam.parammaps.picpath = this.createTemp.picpath
+          if (this.createTemp.yuanzhi !== '' || this.createTemp.salvage !== '' || this.createTemp.subtractvalue !== '' || this.createTemp.yearUpkeepCost !== '' || this.createTemp.yearMaintainCost !== '') {
+            this.requestParam.parammaps.yuanzhi = parseFloat(this.createTemp.yuanzhi)
+            // if (!rulesValue.test(parseFloat(this.createTemp.yuanzhi)) || !rulesValue.test(parseFloat(this.createTemp.salvage)) || !rulesValue.test(parseFloat(this.createTemp.subtractvalue)) || !rulesValue.test(parseFloat(this.createTemp.yearUpkeepCost)) || !rulesValue.test(parseFloat(this.createTemp.yearMaintainCost))) {
+            if (!rulesValue.test(parseFloat(this.createTemp.yuanzhi))) {
+              this.$message({ type: 'error', message: '原值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.salvage))) {
+              this.$message({ type: 'error', message: '残值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.subtractvalue))) {
+              this.$message({ type: 'error', message: '月核减值请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.yearUpkeepCost))) {
+              this.$message({ type: 'error', message: '保养费用输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+            if (!rulesValue.test(parseFloat(this.createTemp.yearMaintainCost))) {
+              this.$message({ type: 'error', message: '维修费用请输入自然数，最多保留三位小数点', duration: 2000 })
+              return false
+            }
+          }
+          PostDataByName(this.requestParam).then(response => {
+            console.log('新增保存发送参数', this.requestParam)
+            if (response.msg !== 'fail') {
+              if (this.getdataListParm.parammaps.inputDatetime === null) {
+                this.getdataListParm.parammaps.inputDatetime = ''
+              }
+              this.resetCreateTemp()
+              this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
+            } else {
+              failproccess(response, this.$notify)
+            }
+          })
+        }
+      })
+    },
+    form_edit(row) {
+      if (this.dialogFormVisible) {
+        return
+      }
+      this.edit = 0
+      this.getDepartParam.parammaps.pastureId = row.pastureId
+      this.getCreateDepartDownList()
+      this.createTemp = Object.assign({}, row) // copy obj
+      if (row.inputUser !== undefined) {
+        this.createTemp.inputUser = parseInt(row.inputUser)
+      }
+
+      if (this.createTemp.eqClassId !== undefined) {
+        this.defaultCheckedKeys = [this.createTemp.eqClassId]
+      } else {
+        this.createTemp.eqClassId = ''
+        this.defaultCheckedKeys = []
+      }
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['createTemp'].clearValidate()
+      })
+      const urlArray = []
+      const fileList = []
+      if (row.picpath == undefined) {
+        urlArray.push()
+      } else if (row.picpath == '') {
+        urlArray.push()
+      } else {
+        urlArray.push(row.picpath)
+      }
+      for (let i = 0; i < urlArray.length; i++) {
+        const urlObj = {}
+        this.$set(urlObj, 'url', urlArray[i])
+        fileList.push(urlObj)
+      }
+      this.$set(this.createTemp, 'fileList', fileList)
+      console.log(this.createTemp)
+      if (this.createTemp.fileList.length >= 1) {
+        this.showUpload = true
+      } else {
+        this.showUpload = false
+      }
+    },
+    edit_dialog_save() {
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          console.log('-----------', this.createTemp)
+          console.log(this.createTemp.providerId)
+          if (this.createTemp.eqClassId == '' || this.createTemp.eqClassId == undefined || this.createTemp.eqClassId == null) {
+            this.$message({ type: 'warning', message: '请选择设备类别' })
+          } else {
+            this.requestParam.name = 'updateAsset'
+            this.requestParam.parammaps = this.createTemp
+            if (this.createTemp.status === '正常') { this.createTemp.status = 17 }
+            if (this.createTemp.status === '闲置') { this.createTemp.status = 18 }
+            if (this.createTemp.status === '报废') { this.createTemp.status = 19 }
+            if (this.createTemp.status === '封存') { this.createTemp.status = 20 }
+            if (this.createTemp.providerId === '' || this.createTemp.providerId === undefined) { this.createTemp.providerId = 0 }
+            if (this.createTemp.brandId === '' || this.createTemp.brandId == undefined) { this.createTemp.brandId = 0 }
+            if (this.createTemp.yuanzhi === '') { this.createTemp.yuanzhi = 0 }
+            if (this.createTemp.salvage === '') { this.createTemp.salvage = 0 }
+            if (this.createTemp.subtractvalue === '') { this.createTemp.subtractvalue = 0 }
+            if (this.createTemp.yearUpkeepCost === '') { this.createTemp.yearUpkeepCost = 0 }
+            if (this.createTemp.yearMaintainCost === '') { this.createTemp.yearMaintainCost = 0 }
+            if (this.createTemp.baseHours === '') { this.createTemp.baseHours = 0 }
+            if (this.createTemp.upkeepgrade === 'A' || this.createTemp.upkeepgrade === 'B' || this.createTemp.upkeepgrade === 'C') {
+              this.createTemp.upkeepgrade = this.createTemp.upkeepgradeId
+              this.createTemp.upkeepgradeId = ''
+            }
+            this.createTemp.deptId = this.createTemp.deptId
+            this.createTemp.departmentName = this.createTemp.departmentName
+            this.createTemp.employeeId = this.createTemp.employeId
+            // var rulesValue = /^\d+(\.\d{1,3})?$/
+            this.requestParam.parammaps = this.createTemp
+            if (this.tabName === 'first') {
+              this.requestParam.parammaps.SHStatus = this.createTemp.SHStatus
+            } else if (this.tabName === 'second') {
+              this.requestParam.parammaps.SHStatus = 0
+            }
+            const picpath = parseInt(this.createTemp.picpath)
+            if (isNaN(picpath) == false) {
+              this.requestParam.parammaps.picpath = this.createTemp.picpath
+            } else {
+              this.requestParam.parammaps.picpath = this.createTemp.picId
+            }
+            PostDataByName(this.requestParam).then(response => {
+              console.log(response)
+              if (response.msg !== 'fail') {
+                if (this.getdataListParm.parammaps.inputDatetime1 === null) {
+                  this.getdataListParm.parammaps.inputDatetime1 = ''
+                }
+                this.get_table_data()
+                this.get_table_dataSH()
+                this.dialogFormVisible = false
+                this.$notify({ title: '成功', message: '保存成功-', type: 'success', duration: 2000 })
+                // this.reload()
+              } else {
+                failproccess(response, this.$notify)
+              }
+            })
+          }
+        }
+      })
+    },
+    brandSearch(queryString, cb) {
+      console.log('品牌模糊查询输入值', queryString)
+      this.requestBrand.parammaps['brandName'] = queryString
+      GetDataByName(this.requestBrand).then(response => {
+        console.log('品牌模糊查询搜索data', response.data.list)
+        this.BrandList = response.data.list
+        cb(this.BrandList)
+      })
+    },
+    handleSelectBrand(item) {
+      console.log('品牌模糊查询选中值', item)
+      this.$set(this.createTemp, 'brandName', item.brandName)
+      this.$set(this.createTemp, 'brandId', item.brandId)
+      this.$forceUpdate()
+    },
+    employeSearch(queryString, cb) {
+      console.log('责任人模糊查询输入值', queryString)
+      this.requestEmploye.parammaps['empname'] = queryString
+      GetDataByName(this.requestEmploye).then(response => {
+        console.log('责任人模糊查询搜索data', response.data.list)
+        this.employeList = response.data.list
+        cb(this.employeList)
+      })
+    },
+    handleSelectEmploye(item) {
+      console.log('责任人模糊查询选中值', item)
+      this.$set(this.createTemp, 'employeId', item.id)
+      this.$set(this.createTemp, 'employeName', item.name)
+      this.$forceUpdate()
+    },
+    form_see(row) {
+      console.log(row)
+      this.seeTemp = Object.assign({}, row) // copy obj
+      this.activeName = 'first'
+      this.dialogStatus = 'card'
+      this.dialogFormVisible_See = true
+      // 流程图
+      var reason = '未通过原因:' + this.seeTemp.workflowNote
+      if (this.seeTemp.SHStatus === 0) {
+        this.activeList = [{ title: '提交信息', date: this.seeTemp.inputDatetime, name: this.seeTemp.inputUserName }, { title: '设备中心审核' }]
+        this.active = 1
+      } else if (this.seeTemp.SHStatus === 1) {
+        this.activeList = [{ title: '提交信息', date: this.seeTemp.inputDatetime, name: this.seeTemp.inputUserName }, { title: '设备中心审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson }]
+        this.active = 2
+      } else if (this.seeTemp.SHStatus === 2) {
+        this.activeList = [{ title: '提交信息', date: this.seeTemp.inputDatetime, name: this.seeTemp.inputUserName }, { title: '设备中心审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson, status: 'error', reason: reason }]
+        this.active = 2
+      }
+      // 查看-点检记录
+    },
+    form_seeTabClick(val) {
+      console.log(val)
+      if (val.name == 'second') {
+        this.getAssetBigSpotCheckList()
+      } else if (val.name == 'third') {
+        this.getBigupkeepbyeqList()
+      } else if (val.name == 'fouth') {
+        this.getAssetMaintainList()
+      } else if (val.name == 'fifth') {
+        this.getAssetSTTList()
+      } else if (val.name == 'sixth') {
+        this.getAssetChangeList()
+      } else if (val.name == 'seventh') {
+        this.getAssetPartApplyList()
+      } else if (val.name == 'eighth') {
+        this.getBarChart1Parm.parammaps.eqId = this.seeTemp.id
+        this.getBarChart2Parm.parammaps.eqId = this.seeTemp.id
+        this.getChartSeeParm.parammaps.eqId = this.seeTemp.id
+
+        this.getBarChart1()
+        this.getBarChart2()
+      }
+    },
+    // 点检记录
+    getAssetBigSpotCheckList() {
+      this.listLoadingSpotCheck1 = true
+      if (this.$refs['inputDatetimeCheck1'] !== undefined && this.$refs['inputDatetimeCheck1'].value !== null) {
+        this.getAssetBigSpotCheckListParm.parammaps.startTime = this.$refs['inputDatetimeCheck1'].value[0]
+        this.getAssetBigSpotCheckListParm.parammaps.stopTime = this.$refs['inputDatetimeCheck1'].value[1]
+      } else {
+        this.getAssetBigSpotCheckListParm.parammaps.startTime = ''
+        this.getAssetBigSpotCheckListParm.parammaps.stopTime = ''
+      }
+      this.getAssetBigSpotCheckListParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetBigSpotCheckListParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetBigSpotCheckListParm).then(response => {
+        console.log('点检记录-table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listSpotCheck1 = response.data.list
+          this.pageNumSpotCheck1 = response.data.pageNum
+          this.pageSizeSpotCheck1 = response.data.pageSize
+        } else {
+          this.listSpotCheck1 = []
+        }
+        this.totalSpotCheck1 = response.data.total
+        setTimeout(() => {
+          this.listLoadingSpotCheck1 = false
+        }, 100)
+      })
+    },
+    form_searchSportCheck() {
+      if (this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 == null) {
+        this.getAssetBigSpotCheckListParm.parammaps.inputDatetimeCheck1 = ''
+      }
+      this.getAssetBigSpotCheckListParm.offset = 1
+      this.getAssetBigSpotCheckList()
+    },
+    // 保养记录
+    getBigupkeepbyeqList() {
+      this.listLoadingSpotCheck1 = true
+      if (this.$refs['inputDatetimeUpkeepbyeq'] !== undefined && this.$refs['inputDatetimeUpkeepbyeq'].value !== null) {
+        this.getBigupkeepbyeqParm.parammaps.startTime = this.$refs['inputDatetimeUpkeepbyeq'].value[0]
+        this.getBigupkeepbyeqParm.parammaps.stopTime = this.$refs['inputDatetimeUpkeepbyeq'].value[1]
+      } else {
+        this.getBigupkeepbyeqParm.parammaps.startTime = ''
+        this.getBigupkeepbyeqParm.parammaps.stopTime = ''
+      }
+      this.getBigupkeepbyeqParm.parammaps.assetId = this.seeTemp.assetId
+      this.getBigupkeepbyeqParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getBigupkeepbyeqParm).then(response => {
+        console.log('保养记录-table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listUpkeepbyeq = response.data.list
+          this.pageNumUpkeepbyeq = response.data.pageNum
+          this.pageSizeUpkeepbyeq = response.data.pageSize
+        } else {
+          this.listUpkeepbyeq = []
+        }
+        this.totalUpkeepbyeq = response.data.total
+        setTimeout(() => {
+          this.listLoadingSpotCheck1 = false
+        }, 100)
+      })
+    },
+    form_searchUpkeepbyeq() {
+      if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq === null) {
+        this.getBigupkeepbyeqParm.parammaps.inputDatetimeUpkeepbyeq = ''
+      }
+      this.getBigupkeepbyeqParm.offset = 1
+      this.getBigupkeepbyeqList()
+    },
+    // 维修记录
+    getAssetMaintainList() {
+      this.listLoadingAssetMaintain = true
+      if (this.$refs['inputDatetimeAssetMaintain'] !== undefined && this.$refs['inputDatetimeAssetMaintain'].value !== null) {
+        this.getAssetMaintainParm.parammaps.startTime = this.$refs['inputDatetimeAssetMaintain'].value[0]
+        this.getAssetMaintainParm.parammaps.stopTime = this.$refs['inputDatetimeAssetMaintain'].value[1]
+      } else {
+        this.getAssetMaintainParm.parammaps.startTime = ''
+        this.getAssetMaintainParm.parammaps.stopTime = ''
+      }
+      this.getAssetMaintainParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetMaintainParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetMaintainParm).then(response => {
+        console.log('维修记录-tabile数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listAssetMaintain = response.data.list
+          this.pageNumAssetMaintain = response.data.pageNum
+          this.pageSizeAssetMaintain = response.data.pageSize
+        } else {
+          this.listAssetMaintain = []
+        }
+
+        this.totalAssetMaintain = response.data.total
+
+        setTimeout(() => {
+          this.listLoadingAssetMaintain = false
+        }, 100)
+      })
+    },
+    form_searchAssetMaintain() {
+      if (this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan === null) {
+        this.getBigupkeepbyeqParm.parammaps.inputDatetimeAssetMaintan = ''
+      }
+      this.getBigupkeepbyeqParm.offset = 1
+      this.getAssetMaintainList()
+    },
+    // 启停记录
+    getAssetSTTList() {
+      this.listLoadingAssetSTT = true
+      this.getAssetSTTParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetSTTParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetSTTParm).then(response => {
+        console.log('启停记录-tabile数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listAssetSTT = response.data.list
+          this.pageNumAssetSTT = response.data.pageNum
+          this.pageSizeAssetSTT = response.data.pageSize
+        } else {
+          this.listAssetSTT = []
+        }
+        this.totalAssetSTT = response.data.total
+        setTimeout(() => {
+          this.listLoadingAssetSTT = false
+        }, 100)
+      })
+    },
+    form_searchAssetSTT() {
+      if (this.getAssetSTTParm.parammaps.startTime == null) {
+        this.getAssetSTTParm.parammaps.startTime = ''
+      }
+      if (this.getAssetSTTParm.parammaps.stopTime == null) {
+        this.getAssetSTTParm.parammaps.stopTime = ''
+      }
+      this.getAssetSTTParm.offset = 1
+      this.getAssetSTTList()
+    },
+    // 变更记录
+    getAssetChangeList() {
+      this.listLoadingAssetChange = true
+      console.log(this.$refs['inputDatetimeAssetChange'])
+      if (this.$refs['inputDatetimeAssetChange'] !== undefined && this.$refs['inputDatetimeAssetChange'].value !== null) {
+        this.getAssetChangeParm.parammaps.startTime = this.$refs['inputDatetimeAssetChange'].value[0]
+        this.getAssetChangeParm.parammaps.stopTime = this.$refs['inputDatetimeAssetChange'].value[1]
+      } else {
+        this.getAssetChangeParm.parammaps.startTime = ''
+        this.getAssetChangeParm.parammaps.stopTime = ''
+      }
+      this.getAssetChangeParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetChangeParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetChangeParm).then(response => {
+        console.log('变更记录-tabile数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listAssetChange = response.data.list
+          this.pageNumAssetChange = response.data.pageNum
+          this.pageSizeAssetChange = response.data.pageSize
+        } else {
+          this.listAssetChange = []
+        }
+        this.totalAssetChange = response.data.total
+        setTimeout(() => {
+          this.listLoadingAssetChange = false
+        }, 100)
+      })
+    },
+    form_searchAssetChange() {
+      if (this.getAssetChangeParm.parammaps.inputDatetimeAssetChange === null) {
+        this.getAssetChangeParm.parammaps.inputDatetimeAssetChange = ''
+      }
+      this.getAssetChangeParm.offset = 1
+      this.getAssetChangeList()
+    },
+    changeStatue: function(cellValue) {
+      if (cellValue.changeStatue == 17) {
+        return '正常'
+      } else if (cellValue.changeStatue == 18) {
+        return '闲置'
+      } else if (cellValue.changeStatue == 19) {
+        return '报废'
+      } else if (cellValue.changeStatue == 20) {
+        return '封存'
+      }
+    },
+    // 备件领用记录
+    getAssetPartApplyList() {
+      this.listLoadingAssetChange = true
+      console.log(this.$refs['inputDatetimeAssetPartApply'].value)
+      if (this.$refs['inputDatetimeAssetPartApply'] !== undefined && this.$refs['inputDatetimeAssetPartApply'].value !== null && this.$refs['inputDatetimeAssetPartApply'].value !== '') {
+        this.getAssetPartApplyParm.parammaps.startTime = this.$refs['inputDatetimeAssetPartApply'].value[0]
+        this.getAssetPartApplyParm.parammaps.stopTime = this.$refs['inputDatetimeAssetPartApply'].value[1]
+      } else {
+        this.getAssetPartApplyParm.parammaps.startTime = ''
+        this.getAssetPartApplyParm.parammaps.stopTime = ''
+      }
+      this.getAssetPartApplyParm.parammaps.assetId = this.seeTemp.assetId
+      this.getAssetPartApplyParm.parammaps.pastureId = this.seeTemp.pastureId
+      GetDataByName(this.getAssetPartApplyParm).then(response => {
+        console.log('备件领用记录-tabile数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listAssetPartApply = response.data.list
+          this.pageNumAssetPartApply = response.data.pageNum
+          this.pageSizeAssetPartApply = response.data.pageSize
+        } else {
+          this.listAssetPartApply = []
+        }
+        this.totalAssetPartApply = response.data.total
+        setTimeout(() => {
+          this.listLoadingAssetPartApply = false
+        }, 100)
+      })
+    },
+    form_searchAssetPartApply() {
+      this.listLoadingAssetChange = true
+      if (this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange == null) {
+        this.getAssetPartApplyParm.parammaps.inputDatetimeAssetChange = ''
+      }
+      this.getAssetPartApplyParm.offset = 1
+      this.getAssetPartApplyList()
+    },
+    getBarChart1() {
+      GetReportform(this.getBarChart1Parm).then(response => {
+        console.log('图1', response)
+        this.chart_data1 = response.data.chart_data
+        var repireCost = response.data.chart_data.repireCost
+        var upkeepCost = response.data.chart_data.upkeepCost
+        var totaltitle1 = 0
+        if (repireCost !== null || repireCost !== undefined) {
+          repireCost.forEach(function(item, index) {
+            console.log(parseFloat(item))
+            totaltitle1 = totaltitle1 + parseFloat(item)
+          })
+        }
+        var totaltitle2 = 0
+        if (upkeepCost !== null || upkeepCost !== undefined) {
+          upkeepCost.forEach(function(item, index) {
+            console.log(parseFloat(item))
+            totaltitle2 = totaltitle2 + parseFloat(item)
+          })
+        }
+        this.totaltitle = totaltitle1 + totaltitle2
+        this.roadBarChart1(this.chart_data1, this.totaltitle.toFixed(2))
+      })
+    },
+    roadBarChart1(chart_data1, totaltitle) {
+      console.log(chart_data1, totaltitle)
+      if (this.barChart1 != null) {
+        this.barChart1.dispose()
+      }
+      this.barChart1 = echarts.init(document.getElementById('barChart1'))
+      var option = {
+        title: { text: '年度费用统计（总费用:' + totaltitle + '元）', textStyle: { color: '#769cfc' }},
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为:'line' | 'shadow'
+          },
+          formatter: function(data) {
+            console.log(data.length)
+            var value = 0
+            let val = ''
+            if (data.length == 1) {
+              val += data[0].seriesName + ':' + data[0].data + '元<br/>'
+            } else {
+              value = (parseFloat(data[0].value) + parseFloat(data[1].value)).toFixed(2)
+              // eslint-disable-next-line no-unused-vars
+              val = data[0].name + '年设备总费用:' + value + '元' + '<br/>'
+              val += '维修费用:' + data[0].data + '元<br/>'
+              val += '保养费用:' + data[1].data + '元<br/>'
+            }
+            return val
+          }
+        },
+        legend: {
+          data: ['维修费用', '保养费用'],
+          x: 'right'
+        },
+        color: ['#769cfc', '#42b983'],
+        grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
+        xAxis: [
+          { type: 'category', data: this.chart_data1.year }
+        ],
+        yAxis: [
+          { type: 'value', name: '费用(元)' }
+        ],
+        series: [
+          { name: '维修费用', type: 'bar', barWidth: 60, stack: '广告', data: this.chart_data1.repireCost },
+          { name: '保养费用', type: 'bar', barWidth: 60, stack: '广告', data: this.chart_data1.upkeepCost }
+        ]
+      }
+      this.barChart1.setOption(option)
+      var that = this
+      window.onresize = function() {
+        that.barChart1.resize()
+      }
+      this.barChart1.on('click', function(param, i) {
+        console.log(param)
+        that.getBarChart2Parm.parammaps.receiveTime = param.name
+        that.getBarChart2()
+        that.getBarChart1()
+      })
+    },
+    getBarChart2() {
+      GetReportform(this.getBarChart2Parm).then(response => {
+        console.log('图2', response)
+        this.chart_data2 = response.data.chart_data
+        this.roadBarChart2(this.chart_data2)
+      })
+    },
+    roadBarChart2(chart_data1) {
+      if (this.barChart2 != null) {
+        this.barChart2.dispose()
+      }
+      this.barChart2 = echarts.init(document.getElementById('barChart2'))
+      var option = {
+        title: { text: this.getBarChart2Parm.parammaps.receiveTime + '年月度费用统计', textStyle: { color: '#769cfc' }},
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为:'line' | 'shadow'
+          },
+          formatter: function(data) {
+            console.log(data)
+            var value = 0
+            var val = ''
+            if (data.length == 1) {
+              val += data[0].seriesName + ':' + data[0].data + '元<br/>'
+            } else {
+              value = (parseFloat(data[0].value) + parseFloat(data[1].value)).toFixed(2)
+              val = data[0].name + '月设备总费用:' + value + '元' + '<br/>'
+              val += '维修费用:' + data[0].data + '元<br/>'
+              val += '保养费用:' + data[1].data + '元<br/>'
+            }
+            return val
+          }
+        },
+        legend: {
+          data: ['维修费用', '保养费用'],
+          x: 'right'
+        },
+        color: ['#769cfc', '#42b983'],
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          { type: 'category', data: this.chart_data2.months }
+        ],
+        yAxis: [
+          { type: 'value', name: '费用(元)' }
+        ],
+        series: [
+          { name: '维修费用', type: 'bar', stack: '广告', data: this.chart_data2.repireCost },
+          { name: '保养费用', type: 'bar', stack: '广告', data: this.chart_data2.upkeepCost }
+        ]
+      }
+      this.barChart2.setOption(option)
+      var that = this
+      window.onresize = function() {
+        that.barChart2.resize()
+      }
+      this.barChart2.on('click', function(param, i) {
+        console.log(param)
+        that.dialogFormVisible_ChartSee = true
+        that.dialogStatus = 'card'
+        that.getChartSeeParm.parammaps.receiveTime = param.name
+        that.getChartSeeList()
+        that.getBarChart1()
+        that.getBarChart2()
+      })
+    },
+    getChartSeeList() {
+      this.listLoadingChartSee = true
+      if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
+        this.getChartSeeParm.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
+        this.getChartSeeParm.parammaps.stopTime = this.$refs['inputDatetime2'].value[1]
+      } else {
+        this.getChartSeeParm.parammaps.startTime = ''
+        this.getChartSeeParm.parammaps.stopTime = ''
+      }
+      GetDataByName(this.getChartSeeParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.listChartSee = response.data.list
+          this.pageNumChartSee = response.data.pageNum
+          this.pageSizeChartSee = response.data.pageSize
+          if (response.data.total) {
+            this.totalChartSee = response.data.total
+          }
+        } else {
+          this.listChartSee = []
+        }
+        setTimeout(() => {
+          this.listLoadingChartSee = false
+        }, 100)
+      })
+    },
+    form_searchChartSee() {
+      this.listLoadingChartSee = true
+      if (this.getChartSeeParm.parammaps.inputDatetime2 === null) {
+        this.getChartSeeParm.parammaps.inputDatetime2 = ''
+      }
+      this.getChartSeeParm.offset = 1
+      this.getChartSeeList()
+    },
+ 
+    form_delete(row) {
+      MessageBox.confirm('确认删除此信息?', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.requestParam.name = 'deleteAsset'
+        this.requestParam.parammaps = {}
+        this.requestParam.parammaps['id'] = row.id
+        PostDataByName(this.requestParam).then(() => {
+          if (this.getdataListParm.parammaps.inputDatetime1 === null) {
+            this.getdataListParm.parammaps.inputDatetime1 = ''
+          }
+          this.get_table_data()
+        
+          this.dialogFormVisible = false
+          this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+        })
+      }).catch(() => {
+        this.$message({ type: 'info', message: '已取消删除' })
+      })
+    },
+    getDownClassList() {
+      getRecuData(this.getRecuListParm).then(response => {
+        this.parentClass = response.data
+      })
+    },
+
+    getEQNumber() {
+      this.getdataEQNumber.parammaps.pastureId = Cookies.get('pastureid')
+      GetDataByName(this.getdataEQNumber).then(response => {
+
+        
+        this.createTemp.assetCode = response.data.list[0].createNumber
+        console.log(response.data.list[0].createNumber)
+        console.log(this.createTemp.assetCode)
+        this.$forceUpdate()
+        
+      })
+    },
+
+   
+ 
+    changeSHStatue(val) {
+      if (val == 2) {
+        this.statueReason = true
+      } else {
+        this.statueReason = false
+      }
+    },
+   
+ 
+   
+   
+    changeBatchDept(item) {
+      console.log(item)
+      this.batchChange.getdataListParmPerson.parammaps.deptId = item
+      this.batchChange.temp.employeeId = ''
+      this.batchChange.getdataListParmPerson.parammaps.pastureId = this.batchChange.deptList.find(obj => obj.deptid == item).pastureId
+      this.getBatchChangePersonDownList()
+    },
+    getBatchChangePersonDownList() {
+      GetDataByName(this.batchChange.getdataListParmPerson).then(response => {
+        if (response.data.list !== null) {
+          this.batchChange.personList = response.data.list
+        } else {
+          this.batchChange.personList = []
+        }
+      })
+    },
+    changeBatchPerson(item) {
+      console.log(item)
+      this.batchChange.temp.employeeId = item
+      this.batchChange.temp.employeName = this.batchChange.personList.find(obj => obj.id == item).empname
+      this.$forceUpdate()
+    },
+    changeData() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['batchChangeTemp'].validate(valid => {
+        if (valid) {
+          this.requestParam = {}
+          var array = []
+          for (let i = 0; i < this.selectionList.length; i++) {
+            var obj = {}
+            var parammaps = {}
+            obj.name = 'updateEquipmentALL'
+            obj.offset = 0
+            obj.pagecount = 0
+            parammaps.departmentId = this.batchChange.temp.departmentId
+            parammaps.employeeId = this.batchChange.temp.employeeId
+            parammaps.employeName = this.batchChange.temp.employeName
+            parammaps.id = this.selectionList[i].id
+            obj.parammaps = parammaps
+            array.push(obj)
+          }
+          this.requestParam.array = array
+          PostDataByNames(this.requestParam).then(response => {
+            if (response.msg !== 'fail') {
+              this.dialogFormVisible_change = false
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.get_table_data()
+            } else {
+              failproccess(response, this.$notify)
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .el-autocomplete-suggestion li{
+    padding:0 3px!important;
+  }
+  .el-table .warning-row {
+      background: oldlace;
+  }
+  .el-table .success-row {
+      background: #f0f9eb;
+  }
+</style>
+<style lang="scss">
+  .upkeepgrade .el-form-item__label{
+    line-height: 20px;
+  }
+  .inputDatetime .el-range-separator{
+   padding: 0;
+   margin: 0 10px;
+  }
+  .el-radio__label{
+    padding-left: 2px !important;
+  }
+</style>
+<style>
+  .el-table .goBeyond { background: #F47C7C ; }
+  .el-table .warning { background: #989DF0; }
+  .el-table .scrap { background: #D7D7D7; }
+</style>

src/views/asset/basics/index.vue

@@ -21,7 +21,7 @@
             :node-key="nodeKey"
             clearable
             :disabled="disabled"
-            :placeholder="placeholder"
+             placeholder="请选择设备类别"
             :checked-keys="defaultCheckedKeys"
             style="display: inline-block;"
             @popoverHide="popoverHide"
@@ -125,7 +125,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+          <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
         </div>
       </el-tab-pane>
       <el-tab-pane v-if="isBasicSH" label="审核设备" name="second">
@@ -201,7 +201,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="totalSH>=0" :total="totalSH" :page.sync="getdataListParmSH.offset" :limit.sync="getdataListParmSH.pagecount" @pagination="getListSH" />
+          <pagination v-show="totalSH>=0" :total="totalSH" :page.sync="getdataListParmSH.offset" :limit.sync="getdataListParmSH.pagecount" @pagination="get_table_dataSH" />
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -209,7 +209,7 @@
     <!-- 新增 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible"  v-show = "dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="app-add">
-        <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="115px" style="width: 90%;margin:0 auto 30px">
+        <el-form ref="createTemp" :rules="rulesCreate" :model="createTemp" label-position="right" label-width="115px" style="width: 90%;margin:0 auto 30px">
           <el-row>
             <el-col :span="10">
               <el-form-item label="设备类别:" prop="eqClassId">
@@ -378,6 +378,43 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6">
+              <el-form-item label="指定维修人:" prop="maintenance">
+                <el-select v-model="createTemp.maintenance"   placeholder="指定维修人" class="filter-item" style="width: 100%;" >
+                  <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="间隔时间:" prop="pushTime">
+                <el-select v-model="createTemp.pushTime" placeholder="间隔时间" class="filter-item">
+                  <el-option v-for="item in pushNameList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="一级督办:" prop="levelone">
+                <el-select v-model="createTemp.levelone" placeholder="一级督办" class="filter-item">
+                  <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="二级督办:" prop="leveltwo">
+                <el-select v-model="createTemp.leveltwo" placeholder="二级督办" class="filter-item">
+                  <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="三级督办:" prop="levelthree">
+                <el-select v-model="createTemp.levelthree" placeholder="三级督办" class="filter-item">
+                  <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item label="设备图片:">
                 <el-upload
@@ -560,7 +597,35 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
+
                 <el-row>
+                <el-col :span="6">
+                  <el-form-item label="指定维修人:" prop="maintenanceName">
+                    <el-input ref="maintenanceName" v-model="seeTemp.maintenanceName" placeholder="" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="间隔时间:" prop="pushTime">
+                    <el-input ref="pushTime" v-model="seeTemp.pushTime" placeholder="" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="一级督办:" prop="leveloneName">
+                    <el-input ref="leveloneName" v-model="seeTemp.leveloneName" placeholder="" disabled />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="二级督办:" prop="leveltwoName">
+                    <el-input ref="leveltwoName" v-model="seeTemp.leveltwoName" placeholder="" disabled />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="三级督办:" prop="levelthreeName">
+                    <el-input ref="levelthreeName" v-model="seeTemp.levelthreeName" placeholder="" disabled />
+                  </el-form-item>
+                </el-col>
                   <el-col>
                     <el-form-item label="设备图片:">
                       <el-popover placement="right" title="" trigger="hover">
@@ -996,7 +1061,7 @@ export default {
       isBasicsAdd: [], isBasicsCard: [], isBasicsUpdate: [], isBasicsDel: [], isBasicsDel2: [], isBasic: [], isBasicSH: [], isBasicExamine: [],
       rules: {
         // assetCode: [{ required: true, message: '必填', trigger: 'blur' }],
-        eqName: [{ required: true, message: '必填', trigger: 'blur' }],
+        //eqName: [{ required: true, message: '必填', trigger: 'blur' }],
         eqCode: [{ required: true, message: '必填', trigger: 'blur' }],
         financeCode: [{ required: true, message: '必填', trigger: 'blur' }],
         departmentId: [{ required: true, message: '必填', trigger: 'blur' }],
@@ -1016,10 +1081,45 @@ export default {
           }, 0)
         }, trigger: 'blur' }]
       },
+      rulesCreate: {
+        // assetCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        //eqName: [{ required: true, message: '必填', trigger: 'blur' }],
+        eqCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        financeCode: [{ required: true, message: '必填', trigger: 'blur' }],
+        departmentId: [{ required: true, message: '必填', trigger: 'blur' }],
+        employeeId: [{ required: true, message: '必填', trigger: 'blur' }],
+        
+        deptId: [{ required: true, message: '必填', trigger: 'blur' }],
+        employeName: [{ required: true, message: '必填', trigger: 'blur' }],
+        pastureId: [{ required: true, message: '必填', trigger: 'blur' }],
+        maintenance: [{ required: true, message: '必填', trigger: 'blur' }],
+        pushTime: [{ required: true, message: '必填', trigger: 'blur' }],
+        levelone: [{ required: true, message: '必填', trigger: 'blur' }],
+        leveltwo: [{ required: true, message: '必填', trigger: 'blur' }],
+        levelthree: [{ required: true, message: '必填', trigger: 'blur' }],
+
+
+        depreciation: [{ type: 'number', required: true, validator: (rule, value, callback) => {
+          if (!value) {
+            callback(new Error('不能为空'))
+          }
+          setTimeout(() => {
+            const re = /^[0-9]*[1-9][0-9]*$/ // /^[0-9]*[1-9][0-9]*$/
+            const rsCheck = re.test(value)
+            if (!rsCheck) {
+              callback(new Error('请输入正整数'))
+            } else {
+              callback()
+            }
+          }, 0)
+        }, trigger: 'blur' }]
+      },
+      placeholder:"请选择设备类别",
       findAllBrand: [], findAllProvider: [],
       findAllAssetType: [], findAllPasture: [], findAllDepart: [], findAllEmploye: [],
       getDictByName: [], upkeepgrades: [], createDepartList: [],
       statues: [{ id: '0', name: '审核中' }, { id: '1', name: '已通过' }, { id: '2', name: '未通过' }],
+      pushNameList: [{ id: '60', name: '60' }, { id: '120', name: '120' }, { id: '180', name: '180' }],
       depreciationAlertList: [{ id: '0', name: '正常' }, { id: '1', name: '到期预警' }, { id: '2', name: '超期使用' }],
       requestParams: [
         { name: 'findAllBrand', offset: 0, pagecount: 0, params: [] },
@@ -1032,7 +1132,7 @@ export default {
         { name: 'getdictbyname', offset: 0, pagecount: 0, params: ['保养级别'] }
       ],
       getDepartParam: { name: 'findAllDepart1', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid'), 'eId': Cookies.get('employeid') }},
-      disabled: false, placeholder: '请选择设备类别',
+      disabled: false,  
       nodeKey: 'id',
       defaultCheckedKeys: [],
       parentClass: [],
@@ -1066,7 +1166,7 @@ export default {
       uploadImageUrl: process.env.VUE_APP_BASE_API + 'authdata/uploaderimage',
       width: '',
 
-      createTemp: { inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), employeId: this.$store.state.user.employeid, inputUser: this.$store.state.user.employeid, deptId: this.$store.state.user.departmentid, departmentName: Cookies.get('departmentname'), pastureId: this.$store.state.user.pastureid, assetCode: '', eqClassName: '', eqClassId: '', eqCode: '', eqName: '', specification: '', providerName: '', brandName: '', financeCode: '', status: '正常', purpose: '', purchaseDate: parseTime(new Date(), '{y}-{m}-{d}'), entranceDate: parseTime(new Date(), '{y}-{m}-{d}'), yearUpkeepCost: '', yearMaintainDost: '', yuanzhi: '', baseHours: '', upkeepgrade: '', salvage: '', subtractvalue: '', yearMaintainCost: '', brandId: '', providerId: '', inputUserName: '', employeName: this.$store.state.user.employename, depreciation: '' },
+      createTemp: { inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), employeId: this.$store.state.user.employeid, inputUser: this.$store.state.user.employeid, deptId: this.$store.state.user.departmentid, departmentName: Cookies.get('departmentname'), pastureId: this.$store.state.user.pastureid, assetCode: '', eqClassName: '', eqClassId: '', eqCode: '', eqName: '', specification: '', providerName: '', brandName: '', financeCode: '', status: '正常', purpose: '', purchaseDate: parseTime(new Date(), '{y}-{m}-{d}'), entranceDate: parseTime(new Date(), '{y}-{m}-{d}'), yearUpkeepCost: '', yearMaintainDost: '', yuanzhi: '', baseHours: '', upkeepgrade: '', salvage: '', subtractvalue: '', yearMaintainCost: '', brandId: '', providerId: '', inputUserName: '', employeName: this.$store.state.user.employename, depreciation: '', maintenance: '', levelone: '', leveltwo: '', levelthree: '', pushTime: '' },
       requestParam: { name: 'insertAsset', offset: 0, pagecount: 0, parammaps: {}},
       seeTemp: {},
       dialogFormVisible_Examine: false,
@@ -1225,7 +1325,7 @@ export default {
       that.buttons = response.data.list
       that.get_auto_buttons()
     })
-    this.getListSH()
+    this.get_table_dataSH()
     this.getDownClassList()
     if (this.$route.query.tabName == undefined) {
       this.tabName = 'first'
@@ -1264,7 +1364,7 @@ export default {
           this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
           this.getdataListParm.parammaps.departmentId = ''
         }
-        this.getList()
+        this.get_table_data()
       }, 5000)
     } else {
       if (this.$route.query.pastureName !== undefined && this.$route.query.pastureId !== undefined && this.$route.query.departmentId !== undefined) {
@@ -1276,7 +1376,7 @@ export default {
         this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
         this.getdataListParm.parammaps.departmentId = ''
       }
-      this.getList()
+      this.get_table_data()
     }
     if (this.$route.query.myPath !== undefined && this.$route.query.myPath == 'equipmentOverview') {
       this.getDepartParam.parammaps.pastureId = this.$route.query.pastureId
@@ -1297,7 +1397,7 @@ export default {
           this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
           this.getdataListParm.parammaps.eqClassId = ''
         }
-        this.getList()
+        this.get_table_data()
       }, 5000)
     } else {
       if (this.$route.query.pastureName !== undefined && this.$route.query.pastureId !== undefined && this.$route.query.departmentId !== undefined) {
@@ -1309,7 +1409,7 @@ export default {
         this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
         this.getdataListParm.parammaps.departmentId = ''
       }
-      this.getList()
+      this.get_table_data()
     }
     // 设备购置报废统计
     if (this.$route.query.myPath !== undefined && this.$route.query.myPath == 'PurchaseScrap') {
@@ -1326,7 +1426,7 @@ export default {
       }
     }
 
-    this.getList()
+    this.get_table_data()
     // Window.addEventListener('keyup', )
     this.keyupSubmit()
   },
@@ -1472,7 +1572,7 @@ export default {
     changeDepart(item) {
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime1 == null) {
         this.getdataListParm.parammaps.inputDatetime1 = ''
@@ -1523,7 +1623,7 @@ export default {
         this.get_select_list()
       })
     },
-    getListSH() {
+    get_table_dataSH() {
       this.listLoadingSH = true
       console.log(this.$refs)
       console.log(this.$refs['inputDatetime1'])
@@ -1602,7 +1702,7 @@ export default {
         this.getdataListParm.parammaps.stopTime3 = this.getdataListParm.parammaps.inputDatetime3[1]
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_searchSH() {
       this.listLoadingSH = true
@@ -1613,7 +1713,7 @@ export default {
         this.getdataListParmSH.parammaps.stopTime = this.getdataListParmSH.parammaps.inputDatetime1[1]
       }
       this.getdataListParmSH.offset = 1
-      this.getListSH()
+      this.get_table_dataSH()
     },
     handlePicChange(file, fileList) {
       if (fileList.length > 0) {
@@ -1731,7 +1831,7 @@ export default {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisibleAdd = false
               this.createTemp.providerName = ''
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
@@ -1812,17 +1912,21 @@ export default {
       console.log(checkedIds, checkedData)
       if (checkedIds !== null) {
         this.getdataEQNumber.parammaps.eqCode = checkedData.typeCode
-        if (checkedData.children === undefined) {
-          this.createTemp.eqClassId = checkedData.eqClassId
+        // if (checkedData.children === undefined) {
+        //   this.createTemp.eqClassId = checkedData.eqClassId
+        //   this.createTemp.eqName = checkedData.NewName
+        //   this.getdataListParm.parammaps.eqClassId = checkedData.eqClassId
+        //   this.getEQNumber()
+        // } else {
+        //   this.defaultCheckedKeys = []
+        //   this.createTemp.eqClassId = ''
+        //   this.getdataListParm.parammaps.eqClassId = ''
+        //   this.$message({ type: 'warning', message: '请选择具体设备类型' })
+        // }
+        this.createTemp.eqClassId = checkedData.eqClassId
           this.createTemp.eqName = checkedData.NewName
           this.getdataListParm.parammaps.eqClassId = checkedData.eqClassId
           this.getEQNumber()
-        } else {
-          this.defaultCheckedKeys = []
-          this.createTemp.eqClassId = ''
-          this.getdataListParm.parammaps.eqClassId = ''
-          this.$message({ type: 'warning', message: '请选择具体设备类型' })
-        }
       } else {
         this.defaultCheckedKeys = []
         this.createTemp.eqClassId = ''
@@ -1881,7 +1985,7 @@ export default {
                 this.getdataListParm.parammaps.inputDatetime1 = ''
               }
               this.dialogFormVisible = false
-              this.getList()
+              this.get_table_data()
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
               // this.reload()
             } else {
@@ -1964,6 +2068,22 @@ export default {
         this.createTemp.inputUser = parseInt(row.inputUser)
       }
 
+      if (row.maintenance !== undefined) {
+        this.createTemp.maintenance = parseInt(row.maintenance)
+      }
+      if (row.levelone !== undefined) {
+        this.createTemp.levelone = parseInt(row.levelone)
+      }
+      if (row.leveltwo !== undefined) {
+        this.createTemp.leveltwo = parseInt(row.leveltwo)
+      }
+      if (row.levelthree !== undefined) {
+        this.createTemp.levelthree = parseInt(row.levelthree)
+      }
+      if (row.pushTime !== undefined) {
+        this.createTemp.pushTime = parseInt(row.pushTime)
+      }
+ 
       if (this.createTemp.eqClassId !== undefined) {
         this.defaultCheckedKeys = [this.createTemp.eqClassId]
       } else {
@@ -2045,8 +2165,8 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime1 === null) {
                   this.getdataListParm.parammaps.inputDatetime1 = ''
                 }
-                this.getList()
-                this.getListSH()
+                this.get_table_data()
+                this.get_table_dataSH()
                 this.dialogFormVisible = false
                 this.$notify({ title: '成功', message: '保存成功-', type: 'success', duration: 2000 })
                 // this.reload()
@@ -2584,8 +2704,8 @@ export default {
           if (this.getdataListParm.parammaps.inputDatetime1 === null) {
             this.getdataListParm.parammaps.inputDatetime1 = ''
           }
-          this.getList()
-          this.getListSH()
+          this.get_table_data()
+          this.get_table_dataSH()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
         })
@@ -2621,8 +2741,8 @@ export default {
         this.isFlowChart = true
         this.isDisplayRecord = false
       }
-      this.getList()
-      this.getListSH()
+      this.get_table_data()
+      this.get_table_dataSH()
     },
     handleExamine(row) {
       if (row == undefined) {
@@ -2679,8 +2799,8 @@ export default {
                 this.dialogFormVisible_See = false
                 this.statueReason = false
                 this.$notify({ title: '成功', message: '审核成功', type: 'success', duration: 2000 })
-                this.getListSH()
-                this.getList()
+                this.get_table_dataSH()
+                this.get_table_data()
                 this.activeName == 'second'
               } else {
                 failproccess(response, this.$notify)
@@ -2840,7 +2960,7 @@ export default {
             if (response.msg !== 'fail') {
               this.dialogFormVisible_change = false
               this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
+              this.get_table_data()
             } else {
               failproccess(response, this.$notify)
             }

src/views/asset/basics/index1.vue

@@ -113,7 +113,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+          <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
         </div>
       </el-tab-pane>
       <el-tab-pane v-if="isBasicSH" label="审核设备" name="second">
@@ -189,7 +189,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="totalSH>=0" :total="totalSH" :page.sync="getdataListParmSH.offset" :limit.sync="getdataListParmSH.pagecount" @pagination="getListSH" />
+          <pagination v-show="totalSH>=0" :total="totalSH" :page.sync="getdataListParmSH.offset" :limit.sync="getdataListParmSH.pagecount" @pagination="get_table_dataSH" />
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -1190,7 +1190,7 @@ export default {
       that.buttons = response.data.list
       that.get_auto_buttons()
     })
-    this.getListSH()
+    this.get_table_dataSH()
     this.getDownClassList()
     if (this.$route.query.tabName == undefined) {
       this.tabName = 'first'
@@ -1229,7 +1229,7 @@ export default {
           this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
           this.getdataListParm.parammaps.departmentId = ''
         }
-        this.getList()
+        this.get_table_data()
       }, 5000)
     } else {
       if (this.$route.query.pastureName !== undefined && this.$route.query.pastureId !== undefined && this.$route.query.departmentId !== undefined) {
@@ -1241,7 +1241,7 @@ export default {
         this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
         this.getdataListParm.parammaps.departmentId = ''
       }
-      this.getList()
+      this.get_table_data()
     }
     if (this.$route.query.myPath !== undefined && this.$route.query.myPath == 'equipmentOverview') {
       this.getDepartParam.parammaps.pastureId = this.$route.query.pastureId
@@ -1262,7 +1262,7 @@ export default {
           this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
           this.getdataListParm.parammaps.eqClassId = ''
         }
-        this.getList()
+        this.get_table_data()
       }, 5000)
     } else {
       if (this.$route.query.pastureName !== undefined && this.$route.query.pastureId !== undefined && this.$route.query.departmentId !== undefined) {
@@ -1274,7 +1274,7 @@ export default {
         this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
         this.getdataListParm.parammaps.departmentId = ''
       }
-      this.getList()
+      this.get_table_data()
     }
     // 设备购置报废统计
     if (this.$route.query.myPath !== undefined && this.$route.query.myPath == 'PurchaseScrap') {
@@ -1291,7 +1291,7 @@ export default {
       }
     }
 
-    this.getList()
+    this.get_table_data()
     // Window.addEventListener('keyup', )
     this.keyupSubmit()
   },
@@ -1391,7 +1391,7 @@ export default {
     changeDepart(item) {
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime1 == null) {
         this.getdataListParm.parammaps.inputDatetime1 = ''
@@ -1442,7 +1442,7 @@ export default {
         this.get_select_list()
       })
     },
-    getListSH() {
+    get_table_dataSH() {
       this.listLoadingSH = true
       console.log(this.$refs)
       console.log(this.$refs['inputDatetime1'])
@@ -1521,7 +1521,7 @@ export default {
         this.getdataListParm.parammaps.stopTime3 = this.getdataListParm.parammaps.inputDatetime3[1]
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_searchSH() {
       this.listLoadingSH = true
@@ -1532,7 +1532,7 @@ export default {
         this.getdataListParmSH.parammaps.stopTime = this.getdataListParmSH.parammaps.inputDatetime1[1]
       }
       this.getdataListParmSH.offset = 1
-      this.getListSH()
+      this.get_table_dataSH()
     },
     handlePicChange(file, fileList) {
       if (fileList.length > 0) {
@@ -1650,7 +1650,7 @@ export default {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisibleAdd = false
               this.createTemp.providerName = ''
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
@@ -1800,7 +1800,7 @@ export default {
                 this.getdataListParm.parammaps.inputDatetime1 = ''
               }
               this.dialogFormVisible = false
-              this.getList()
+              this.get_table_data()
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
               // this.reload()
             } else {
@@ -1964,8 +1964,8 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime1 === null) {
                   this.getdataListParm.parammaps.inputDatetime1 = ''
                 }
-                this.getList()
-                this.getListSH()
+                this.get_table_data()
+                this.get_table_dataSH()
                 this.dialogFormVisible = false
                 this.$notify({ title: '成功', message: '保存成功-', type: 'success', duration: 2000 })
                 // this.reload()
@@ -2503,8 +2503,8 @@ export default {
           if (this.getdataListParm.parammaps.inputDatetime1 === null) {
             this.getdataListParm.parammaps.inputDatetime1 = ''
           }
-          this.getList()
-          this.getListSH()
+          this.get_table_data()
+          this.get_table_dataSH()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
         })
@@ -2534,8 +2534,8 @@ export default {
         this.isFlowChart = true
         this.isDisplayRecord = false
       }
-      this.getList()
-      this.getListSH()
+      this.get_table_data()
+      this.get_table_dataSH()
     },
     handleExamine(row) {
       if (row == undefined) {
@@ -2592,8 +2592,8 @@ export default {
                 this.dialogFormVisible_See = false
                 this.statueReason = false
                 this.$notify({ title: '成功', message: '审核成功', type: 'success', duration: 2000 })
-                this.getListSH()
-                this.getList()
+                this.get_table_dataSH()
+                this.get_table_data()
                 this.activeName == 'second'
               } else {
                 failproccess(response, this.$notify)
@@ -2753,7 +2753,7 @@ export default {
             if (response.msg !== 'fail') {
               this.dialogFormVisible_change = false
               this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
+              this.get_table_data()
             } else {
               failproccess(response, this.$notify)
             }

src/views/asset/basics/index2.vue

@@ -113,7 +113,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+          <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
         </div>
       </el-tab-pane>
       <el-tab-pane v-if="isBasicSH" label="审核设备" name="second">
@@ -189,7 +189,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="totalSH>=0" :total="totalSH" :page.sync="getdataListParmSH.offset" :limit.sync="getdataListParmSH.pagecount" @pagination="getListSH" />
+          <pagination v-show="totalSH>=0" :total="totalSH" :page.sync="getdataListParmSH.offset" :limit.sync="getdataListParmSH.pagecount" @pagination="get_table_dataSH" />
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -1190,7 +1190,7 @@ export default {
       that.buttons = response.data.list
       that.get_auto_buttons()
     })
-    this.getListSH()
+    this.get_table_dataSH()
     this.getDownClassList()
     if (this.$route.query.tabName == undefined) {
       this.tabName = 'first'
@@ -1229,7 +1229,7 @@ export default {
           this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
           this.getdataListParm.parammaps.departmentId = ''
         }
-        this.getList()
+        this.get_table_data()
       }, 5000)
     } else {
       if (this.$route.query.pastureName !== undefined && this.$route.query.pastureId !== undefined && this.$route.query.departmentId !== undefined) {
@@ -1241,7 +1241,7 @@ export default {
         this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
         this.getdataListParm.parammaps.departmentId = ''
       }
-      this.getList()
+      this.get_table_data()
     }
     if (this.$route.query.myPath !== undefined && this.$route.query.myPath == 'equipmentOverview') {
       this.getDepartParam.parammaps.pastureId = this.$route.query.pastureId
@@ -1262,7 +1262,7 @@ export default {
           this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
           this.getdataListParm.parammaps.eqClassId = ''
         }
-        this.getList()
+        this.get_table_data()
       }, 5000)
     } else {
       if (this.$route.query.pastureName !== undefined && this.$route.query.pastureId !== undefined && this.$route.query.departmentId !== undefined) {
@@ -1274,7 +1274,7 @@ export default {
         this.getdataListParm.parammaps.pastureId = Cookies.get('pastureid')
         this.getdataListParm.parammaps.departmentId = ''
       }
-      this.getList()
+      this.get_table_data()
     }
     // 设备购置报废统计
     if (this.$route.query.myPath !== undefined && this.$route.query.myPath == 'PurchaseScrap') {
@@ -1291,7 +1291,7 @@ export default {
       }
     }
 
-    this.getList()
+    this.get_table_data()
     // Window.addEventListener('keyup', )
     this.keyupSubmit()
   },
@@ -1391,7 +1391,7 @@ export default {
     changeDepart(item) {
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.getdataListParm.parammaps.inputDatetime1 == null) {
         this.getdataListParm.parammaps.inputDatetime1 = ''
@@ -1442,7 +1442,7 @@ export default {
         this.get_select_list()
       })
     },
-    getListSH() {
+    get_table_dataSH() {
       this.listLoadingSH = true
       console.log(this.$refs)
       console.log(this.$refs['inputDatetime1'])
@@ -1521,7 +1521,7 @@ export default {
         this.getdataListParm.parammaps.stopTime3 = this.getdataListParm.parammaps.inputDatetime3[1]
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_searchSH() {
       this.listLoadingSH = true
@@ -1532,7 +1532,7 @@ export default {
         this.getdataListParmSH.parammaps.stopTime = this.getdataListParmSH.parammaps.inputDatetime1[1]
       }
       this.getdataListParmSH.offset = 1
-      this.getListSH()
+      this.get_table_dataSH()
     },
     handlePicChange(file, fileList) {
       if (fileList.length > 0) {
@@ -1650,7 +1650,7 @@ export default {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisibleAdd = false
               this.createTemp.providerName = ''
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
@@ -1800,7 +1800,7 @@ export default {
                 this.getdataListParm.parammaps.inputDatetime1 = ''
               }
               this.dialogFormVisible = false
-              this.getList()
+              this.get_table_data()
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
               // this.reload()
             } else {
@@ -1964,8 +1964,8 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime1 === null) {
                   this.getdataListParm.parammaps.inputDatetime1 = ''
                 }
-                this.getList()
-                this.getListSH()
+                this.get_table_data()
+                this.get_table_dataSH()
                 this.dialogFormVisible = false
                 this.$notify({ title: '成功', message: '保存成功-', type: 'success', duration: 2000 })
                 // this.reload()
@@ -2503,8 +2503,8 @@ export default {
           if (this.getdataListParm.parammaps.inputDatetime1 === null) {
             this.getdataListParm.parammaps.inputDatetime1 = ''
           }
-          this.getList()
-          this.getListSH()
+          this.get_table_data()
+          this.get_table_dataSH()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
         })
@@ -2534,8 +2534,8 @@ export default {
         this.isFlowChart = true
         this.isDisplayRecord = false
       }
-      this.getList()
-      this.getListSH()
+      this.get_table_data()
+      this.get_table_dataSH()
     },
     handleExamine(row) {
       if (row == undefined) {
@@ -2592,8 +2592,8 @@ export default {
                 this.dialogFormVisible_See = false
                 this.statueReason = false
                 this.$notify({ title: '成功', message: '审核成功', type: 'success', duration: 2000 })
-                this.getListSH()
-                this.getList()
+                this.get_table_dataSH()
+                this.get_table_data()
                 this.activeName == 'second'
               } else {
                 failproccess(response, this.$notify)
@@ -2753,7 +2753,7 @@ export default {
             if (response.msg !== 'fail') {
               this.dialogFormVisible_change = false
               this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
+              this.get_table_data()
             } else {
               failproccess(response, this.$notify)
             }

src/views/asset/complain/index.vue

@@ -125,7 +125,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <el-dialog
       :title="textMap[dialogStatus]"
@@ -301,11 +301,11 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -318,7 +318,7 @@ export default {
     },
     form_search() {
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({

src/views/asset/equipmentAllocation/index.vue

@@ -72,7 +72,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="app-add">
         <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="115px" style="width: 90%;margin:0 auto 30px">
@@ -299,7 +299,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -313,7 +313,7 @@ export default {
         this.findAllPastureIn = response.data.getPastureList.list
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -346,7 +346,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime1 = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetCreateTemp() {
       this.createTemp = {
@@ -560,7 +560,7 @@ export default {
           })
         } else {
           this.getdataListParm.parammaps.inputDatetime = ''
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.createTemp.providerName = ''
           this.$notify({

src/views/asset/install/index.vue

@@ -102,7 +102,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
       <el-form ref="temp" :rules="rules" :model="temp" label-position="right" label-width="140px">
@@ -203,7 +203,7 @@
       <div slot="footer" class="dialog-footer">
 
         <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;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
     <!-- 变更记录 -->
@@ -273,7 +273,7 @@
           :total="totalSee"
           :page.sync="getdataListParmSee.offset"
           :limit.sync="getdataListParmSee.pagecount"
-          @pagination="getListSee"
+          @pagination="get_table_dataSee"
         />
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:10px">
           <el-button @click="dialogFormVisibleCard = false">关闭</el-button>
@@ -443,7 +443,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -523,7 +523,7 @@ export default {
     },
 
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         console.log('表格：', response.data.list)
@@ -577,7 +577,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, statusId) {
       this.$message({
@@ -658,7 +658,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -699,7 +699,7 @@ export default {
               duration: 2000
             })
           } else {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '',
@@ -741,7 +741,7 @@ export default {
       this.cardTitle = '变更记录  设备名称：' + row.eqName + '设备编号：' + row.eqCode
       this.dialogFormVisibleCard = true
       this.getdataListParmSee.parammaps.eqId = row.id
-      this.getListSee()
+      this.get_table_dataSee()
     },
     form_searchDelivery() {
       // this.getdataListParmSee.parammaps.eqId = row.id
@@ -750,9 +750,9 @@ export default {
       }
       console.log('getdataListParmSee', this.getdataListParmSee)
       this.getdataListParmSee.offset = 1
-      this.getListSee()
+      this.get_table_dataSee()
     },
-    getListSee() {
+    get_table_dataSee() {
       console.log('enabledTime', this.$refs['inputDatetime2'])
 
       if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {

src/views/asset/installrecord/index.vue

@@ -125,7 +125,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <el-dialog
       :title="textMap[dialogStatus]"
@@ -301,11 +301,11 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -318,7 +318,7 @@ export default {
     },
     form_search() {
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({

src/views/asset/mailrepair/index.vue

@@ -125,7 +125,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <el-dialog
       :title="textMap[dialogStatus]"
@@ -301,11 +301,11 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -317,7 +317,7 @@ export default {
       })
     },
     form_search() {
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({

src/views/asset/order/index.vue

@@ -125,7 +125,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <el-dialog
       :title="textMap[dialogStatus]"
@@ -301,11 +301,11 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -318,7 +318,7 @@ export default {
     },
     form_search() {
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({

src/views/asset/ordersend/index.vue

@@ -125,7 +125,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <el-dialog
       :title="textMap[dialogStatus]"
@@ -301,11 +301,11 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -319,7 +319,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({

src/views/asset/service/index.vue

@@ -125,7 +125,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <el-dialog
       :title="textMap[dialogStatus]"
@@ -301,11 +301,11 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -319,7 +319,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({

src/views/asset/standardAssetAllocation/index.vue

@@ -75,7 +75,7 @@
         <el-table-column label="实际数量" align="center" prop="realNumber" />
         <el-table-column label="差异" align="center" prop="differences" />
       </el-table>
-      <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     </div>
   </div>
 </template>
@@ -127,7 +127,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getDownClassList()
   },
   methods: {
@@ -149,7 +149,7 @@ export default {
       this.getdataListParm.parammaps.departmentId = ''
       this.getDepartDownList()
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.getdataListParm.parammaps.pastureName == '现代牧业') {
         // this.getdataListParm.parammaps.pastureName = ''
@@ -174,7 +174,7 @@ export default {
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.parammaps.pastureId = this.findAllPasture.find(obj => obj.name == this.getdataListParm.parammaps.pastureName).id
-      this.getList()
+      this.get_table_data()
     },
 
     popoverHide(checkedIds, checkedData) {

src/views/asset/telvisit/index.vue

@@ -125,7 +125,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <el-dialog
       :title="textMap[dialogStatus]"
@@ -301,11 +301,11 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -318,7 +318,7 @@ export default {
     },
     form_search() {
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({

src/views/asset/template/components/baoyang.vue

@@ -137,7 +137,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
     <!-- 保养内容 -->
@@ -226,7 +226,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom:10px">
         <el-button type="primary" :disabled="isokDisable" @click="maintenanceSave()">保存并关闭</el-button>
-        <el-button @click="dialogFormVisibleMaintenanceContents = false;getList()">关闭</el-button>
+        <el-button @click="dialogFormVisibleMaintenanceContents = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
     <!-- 备件 -->
@@ -556,13 +556,13 @@ export default {
       console.log(val)
       if (this.assetTypeid != null) {
         this.getdataListParmUpkeep.parammaps.id = this.assetTypeid
-        this.getList()
+        this.get_table_data()
         this.getTypeList()
       }
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
     this.get_select_list()
   },
 
@@ -579,7 +579,7 @@ export default {
         this.listActive = response.data.getDictByName.list
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParmUpkeep).then(response => {
         console.log('部位table数据', response.data.list)
@@ -650,7 +650,7 @@ export default {
           PostDataByName(this.postDataPramas).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -848,7 +848,7 @@ export default {
           console.log('备件保存发送参数', this.postDataPramas)
           if (response.msg !== 'fail') {
             this.dialogFormVisibleMaintenanceContents = false
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '成功',
               message: '保养成功',
@@ -963,7 +963,7 @@ export default {
           console.log('备件保存发送参数', this.postDataPramas)
           if (response.msg !== 'fail') {
             this.dialogFormVisibleSparePart = false
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '成功',
               message: '保存成功',
@@ -1062,7 +1062,7 @@ export default {
           PostDataByName(this.postDataPramas).then(response => {
             console.log('编辑保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -1089,7 +1089,7 @@ export default {
           this.requestParam.parammaps.id = row.id
           PostDataByName(this.requestParam).then((response) => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.$notify({
                 title: '成功',
                 message: '删除成功',
@@ -1116,7 +1116,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({
           title: '成功',

src/views/asset/template/components/bumeng.vue

@@ -132,7 +132,7 @@ export default {
 
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
   methods: {
 
@@ -192,7 +192,7 @@ export default {
         this.$refs['remark'].focus()
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list

src/views/asset/template/components/buwei.vue

@@ -150,11 +150,11 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</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;get_table_data()">关闭</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;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -386,20 +386,20 @@ export default {
       console.log(val)
       if (this.assetTypeid != null) {
         this.getdataListParm.parammaps.id = this.assetTypeid
-        this.getList()
+        this.get_table_data()
         this.getTypeList()
       }
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   // 设置变量
 
   methods: {
     // ------------------------------------------------------------------
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         console.log('部位table数据', response.data.list)
@@ -517,7 +517,7 @@ export default {
                     console.log('新增保存发送参数', this.postDataPramas)
                     if (response.msg !== 'fail') {
                       this.dialogFormVisible = false
-                      this.getList()
+                      this.get_table_data()
                       this.$notify({
                         title: '成功',
                         message: '新增成功',
@@ -625,7 +625,7 @@ export default {
                 console.log('新增保存发送参数', this.postDataPramas)
                 if (response.msg !== 'fail') {
                   this.dialogFormVisible = false
-                  this.getList()
+                  this.get_table_data()
                   this.$notify({
                     title: '成功',
                     message: '新增成功',
@@ -711,9 +711,9 @@ export default {
       this.dialogStatusSee = 'see'
       this.dialogFormVisibleSee = true
       this.getdataListParmSee.parammaps.positionId = row.id
-      this.getListSee()
+      this.get_table_dataSee()
     },
-    getListSee() {
+    get_table_dataSee() {
       GetDataByName(this.getdataListParmSee).then(response => {
         console.log('部位table数据', response.data.list)
         this.listSee = response.data.list
@@ -735,7 +735,7 @@ export default {
         this.$refs['createTemp'].clearValidate()
       })
       // this.getdataListParmSee.parammaps.positionId = row.id
-      // this.getListPart()
+      // this.get_table_dataPart()
     },
     edit_dialog_save() {
       this.postUpdatePramas.name = 'updatePosition'
@@ -760,7 +760,7 @@ export default {
             duration: 2000
           })
           this.dialogFormVisible = false
-          this.getList()
+          this.get_table_data()
         }
       })
     },
@@ -773,9 +773,9 @@ export default {
         this.$refs['createTemp'].clearValidate()
       })
       this.getdataListParmSee.parammaps.positionId = row.id
-      this.getListPart()
+      this.get_table_dataPart()
     },
-    getListPart() {
+    get_table_dataPart() {
       GetDataByName(this.getdataListParmSee).then(response => {
         console.log('部位table数据', response.data.list)
         this.listAdd = response.data.list
@@ -805,7 +805,7 @@ export default {
     //           duration: 2000
     //         })
     //       } else {
-    //         this.getListPart()
+    //         this.get_table_dataPart()
     //         this.$notify({
     //           title: '',
     //           message: '保存成功',
@@ -843,7 +843,7 @@ export default {
     //           duration: 2000
     //         })
     //       } else {
-    //         this.getListPart()
+    //         this.get_table_dataPart()
     //         this.$notify({
     //           title: '',
     //           message: '保存成功',
@@ -913,7 +913,7 @@ export default {
                 console.log('备件保存发送参数', this.postDataPramas)
                 if (response.msg !== 'fail') {
                   this.dialogFormVisible = false
-                  this.getList()
+                  this.get_table_data()
                   this.$notify({
                     title: '成功',
                     message: '新增成功',
@@ -949,7 +949,7 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps.id = row.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '成功',
               message: '删除成功',

src/views/asset/template/components/buwei1.vue

@@ -150,11 +150,11 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</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;get_table_data()">关闭</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;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -386,20 +386,20 @@ export default {
       console.log(val)
       if (this.assetTypeid != null) {
         this.getdataListParm.parammaps.id = this.assetTypeid
-        this.getList()
+        this.get_table_data()
         this.getTypeList()
       }
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   // 设置变量
 
   methods: {
     // ------------------------------------------------------------------
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         console.log('部位table数据', response.data.list)
@@ -517,7 +517,7 @@ export default {
                     console.log('新增保存发送参数', this.postDataPramas)
                     if (response.msg !== 'fail') {
                       this.dialogFormVisible = false
-                      this.getList()
+                      this.get_table_data()
                       this.$notify({
                         title: '成功',
                         message: '新增成功',
@@ -675,9 +675,9 @@ export default {
       this.dialogStatusSee = 'see'
       this.dialogFormVisibleSee = true
       this.getdataListParmSee.parammaps.positionId = row.id
-      this.getListSee()
+      this.get_table_dataSee()
     },
-    getListSee() {
+    get_table_dataSee() {
       GetDataByName(this.getdataListParmSee).then(response => {
         console.log('部位table数据', response.data.list)
         this.listSee = response.data.list
@@ -699,7 +699,7 @@ export default {
         this.$refs['createTemp'].clearValidate()
       })
       // this.getdataListParmSee.parammaps.positionId = row.id
-      // this.getListPart()
+      // this.get_table_dataPart()
     },
     edit_dialog_save() {
       this.postUpdatePramas.name = 'updatePosition'
@@ -724,7 +724,7 @@ export default {
             duration: 2000
           })
           this.dialogFormVisible = false
-          this.getList()
+          this.get_table_data()
         }
       })
     },
@@ -737,9 +737,9 @@ export default {
         this.$refs['createTemp'].clearValidate()
       })
       this.getdataListParmSee.parammaps.positionId = row.id
-      this.getListPart()
+      this.get_table_dataPart()
     },
-    getListPart() {
+    get_table_dataPart() {
       GetDataByName(this.getdataListParmSee).then(response => {
         console.log('部位table数据', response.data.list)
         this.listAdd = response.data.list
@@ -769,7 +769,7 @@ export default {
     //           duration: 2000
     //         })
     //       } else {
-    //         this.getListPart()
+    //         this.get_table_dataPart()
     //         this.$notify({
     //           title: '',
     //           message: '保存成功',
@@ -807,7 +807,7 @@ export default {
     //           duration: 2000
     //         })
     //       } else {
-    //         this.getListPart()
+    //         this.get_table_dataPart()
     //         this.$notify({
     //           title: '',
     //           message: '保存成功',
@@ -877,7 +877,7 @@ export default {
                 console.log('备件保存发送参数', this.postDataPramas)
                 if (response.msg !== 'fail') {
                   this.dialogFormVisible = false
-                  this.getList()
+                  this.get_table_data()
                   this.$notify({
                     title: '成功',
                     message: '新增成功',
@@ -913,7 +913,7 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps.id = row.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '成功',
               message: '删除成功',

src/views/asset/template/components/dianjian.vue

@@ -103,7 +103,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -312,7 +312,7 @@ export default {
       if (this.assetTypeid != null) {
         this.getdataListParm.parammaps.id = this.assetTypeid
         this.getPartListParam.parammaps.id = this.assetTypeid
-        this.getList()
+        this.get_table_data()
         this.getPartList()
         this.getTypeList()
       }
@@ -322,7 +322,7 @@ export default {
     }
   },
   created() {
-    // this.getList()
+    // this.get_table_data()
 
   },
 
@@ -330,7 +330,7 @@ export default {
 
   methods: {
     // ------------------------------------------------------------------
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         console.log('部位table数据', response.data.list)
@@ -394,7 +394,7 @@ export default {
               })
             } else {
               this.dialogFormVisible = false
-              this.getList()
+              this.get_table_data()
               this.$notify({
                 title: '',
                 message: '保存成功',
@@ -469,7 +469,7 @@ export default {
               })
             } else {
               this.dialogFormVisible = false
-              this.getList()
+              this.get_table_data()
               this.$notify({
                 title: '',
                 message: '保存成功',
@@ -566,7 +566,7 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps.id = row.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '成功',
               message: '删除成功',
@@ -590,7 +590,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({
           title: '成功',

src/views/asset/template/components/guzhang.vue

@@ -98,7 +98,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -351,7 +351,7 @@ export default {
       if (this.assetTypeid != null) {
         this.getdataListParm.parammaps.id = this.assetTypeid
         this.getPartListParam.parammaps.id = this.assetTypeid
-        this.getList()
+        this.get_table_data()
         this.getTypeList()
         this.getPartList()
       }
@@ -361,11 +361,11 @@ export default {
     },
     assetAction(val) {
       console.log(val)
-      this.getList()
+      this.get_table_data()
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   // 设置变量
@@ -375,7 +375,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         console.log('部位table数据', response.data.list)
@@ -456,7 +456,7 @@ export default {
               })
             } else {
               this.dialogFormVisible = false
-              this.getList()
+              this.get_table_data()
               this.$notify({
                 title: '',
                 message: '保存成功',
@@ -578,9 +578,9 @@ export default {
       this.see = true
       this.update = false
       this.getdataListParmSee.parammaps.id = row.id
-      this.getListSee()
+      this.get_table_dataSee()
     },
-    getListSee() {
+    get_table_dataSee() {
       GetDataByName(this.getdataListParmSee).then(response => {
         console.log('部位table数据', response.data.list)
         this.listSee = response.data.list
@@ -602,7 +602,7 @@ export default {
       this.see = false
       this.dialogFormVisibleSee = true
       this.getdataListParmSee.parammaps.id = row.id
-      this.getListSee()
+      this.get_table_dataSee()
     },
     updateSave(row) {
       if (row.appearanceName !== '' && row.appearanceName !== null && row.appearanceName !== undefined) {
@@ -654,8 +654,8 @@ export default {
               duration: 2000
             })
           } else {
-            this.getList()
-            this.getListSee()
+            this.get_table_data()
+            this.get_table_dataSee()
             this.$notify({
               title: '',
               message: '保存成功',
@@ -698,7 +698,7 @@ export default {
               })
             } else {
               this.dialogFormVisible = false
-              this.getList()
+              this.get_table_data()
               this.$notify({
                 title: '',
                 message: '保存成功',
@@ -718,7 +718,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({
           title: '成功',

src/views/asset/template/components/miaoshu.vue

@@ -0,0 +1,558 @@
+<template>
+  <div class="app-container">
+    <div>
+      <el-button class="font-small" style="margin:0 10px 10px 0" type="primary" icon="el-icon-edit" @click="form_add"> 新增  </el-button>
+ 
+    </div>
+    <el-table
+      v-loading="listLoading"
+      element-loading-text="给我一点时间"
+      :data="list"
+      border
+      fit
+      highlight-current-row
+      style="width: 100%;"
+      :row-style="rowStyle"
+      :cell-style="cellStyle"
+      class="elTable table-fixed"
+      row-key="id"
+      default-expand-all
+      @sort-change="tableSort"
+    >
+      <el-table-column label="序号" align="center" type="index" width="50px" />
+      <el-table-column label="描述" min-width="100px" header-align="center" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.describe }}</span>
+        </template>
+      </el-table-column>
+      
+      <el-table-column label="操作" align="center" width="260" fixed="right">
+        <template slot-scope="{row}">
+  
+          <el-button type="danger" size="mini" @click="updateDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 弹出层新增or修改 -->
+    <el-dialog
+      :title="textMap[dialogStatus]"
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      width="50%"
+    >
+      <div class="content-add">
+        <el-form
+          ref="createTemp"
+          :rules="rules"
+          :model="createTemp"
+          label-position="right"
+          label-width="100px"
+          style="width: 90%; margin:0 auto;"
+        >
+          <el-row>
+           
+          </el-row>
+          <el-row>
+            <el-col :span="20">
+              <el-form-item label="故障详情：" prop="describe">
+                <el-input ref="describe" v-model="createTemp.describe" type="text" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button ref="createb" type="success" :disabled="isokDisable" @click="add_dialog_save_again()">保存并新增</el-button>
+        <el-button type="primary" :disabled="isokDisable" @click="add_dialog_save()">保存并关闭</el-button>
+        <el-button @click="dialogFormVisible = false;get_table_data()">取消并关闭</el-button>
+      </div>
+    </el-dialog>
+  
+    
+  </div>
+</template>
+
+<script>
+import waves from '@/directive/waves' // waves directive
+import enterToNext from '@/directive/enterToNext' // enterToNext directive
+import { PostDataByName, GetDataByName, transData, ExecDataByConfig, failproccess } from '@/api/common'
+import { MessageBox } from 'element-ui'
+import TreeSelect from '@/components/TreeSelect'
+import Cookies from 'js-cookie'
+import { getToken } from '@/utils/auth'
+import { parseTime, sortChange } from '@/utils/index.js'
+export default {
+  name: 'Miaoshu',
+  components: { TreeSelect },
+  directives: { waves, enterToNext },
+  props: {
+    assetTypeid: {
+      type: Number,
+      default: 0
+    },
+    assetTypename: {
+      type: String,
+      default: '1'
+    },
+    assetAction: {
+      type: String,
+      default: '1'
+    }
+  },
+  data() {
+    return {
+      textMap: {
+        create: '新增',
+        update: '编辑',
+        copy: '复制',
+        see: '查看详情',
+        addFault: '添加故障'
+      },
+
+      eqClassId:"",
+      dialogFormVisibleCopy: false,
+      dialogStatusCopy: '',
+      disabled: false,
+      parentType: [],
+      getParmType: {
+        name: 'geteqclasslist'
+        // idname: 'id',
+        // params: [-1]
+      },
+      defaultProps: {
+        children: 'children',
+        label: 'typeName'
+      },
+      nodeKey: 'id',
+      defaultCheckedKeys: [],
+      dataform: {
+        id: '',
+        name: '',
+        selectType: [],
+        sort: '',
+        enable: ''
+      },
+      UpdateDataRelationParam: {
+        name: '',
+        dataname: '',
+        datavalue: '',
+        valuename: '',
+        values: ''
+      },
+      getdataListParm: {
+        name: 'getFaultdescription',
+        parammaps: {
+          id: '',
+          eqClassId: '',
+        }
+      },
+      list: [],
+      total: 0,
+      listLoading: true,
+      dialogStatus: '',
+      dialogFormVisible: false,
+      createTemp: {
+        positionId: '',
+        describe: '',
+        note: ''
+      },
+      listPart: [],
+    
+      tableKey: 0,
+      isokDisable: false,
+      postDataPramas: {},
+      
+      dialogStatusSee: '',
+      isDisplay: false,
+      dialogFormVisibleSee: false,
+      listLoadingSee: true,
+      totalSee: 0,
+      listSee: [],
+      getdataListParmSee: {
+        name: 'getAppearancebyPid',
+        returntype: 'Map',
+        parammaps: {}
+      },
+      postUpdatePramas: {},
+      requestParam: {},
+      update: false,
+      see: false,
+      rules: {
+    
+        describe: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+      },
+      rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
+      cellStyle: { padding: 0 + 'px' }
+    }
+  },
+  computed: {
+    headers() {
+      return {
+        token: getToken()
+      }
+    },
+    uploadData() {
+      return {
+        name: 'updateUpKeepAppearance',
+        importParams: '设备类别名称,部位,故障详情,备注',
+        sheetname: 'SheetJS'
+      }
+    },
+    // 设置上传地址
+    uploadExcelUrl() {
+      return process.env.VUE_APP_BASE_API + 'authdata/ImportExcel'
+    }
+  },
+  watch: {
+    assetTypeid(val) {
+      console.log(val)
+      if (this.assetTypeid != null) {
+        this.getdataListParm.parammaps.id = this.assetTypeid
+        this.getdataListParm.parammaps.eqClassId = this.assetTypeid
+        this.eqClassId = this.assetTypeid
+        console.log('eqClassId',eqClassId)
+        this.get_table_data()
+     
+     
+      }
+    },
+    assetTypename(val) {
+      console.log(val)
+    },
+    assetAction(val) {
+      console.log(val)
+      this.get_table_data()
+    }
+  },
+  created() {
+    this.get_table_data()
+  },
+
+  // 设置变量
+
+  methods: {
+    // ------------------------------------------------------------------
+    tableSort(column) {
+      sortChange(column, this.list)
+    },
+    get_table_data() {
+      this.listLoading = true
+      GetDataByName(this.getdataListParm).then(response => {
+        console.log('部位table数据', response.data.list)
+        this.list = response.data.list
+        if (response.data.total) {
+          this.total = response.data.total
+        }
+        // Just to simulate the time of the request
+        setTimeout(() => {
+          this.listLoading = false
+        }, 100)
+      })
+    },
+    resetCreateTemp() {
+      this.createTemp.describe = ''
+      this.createTemp.note = ''
+    },
+   
+    form_add() {
+      if (this.assetTypeid != '') {
+        this.resetCreateTemp()
+        this.dialogStatus = 'create'
+        this.dialogFormVisible = true
+        this.createTemp.positionId = ''
+        console.log(this.assetTypeid)
+        console.log(this.assetTypename)
+        console.log(this.assetLable)
+   
+        console.log(this.listPart)
+      }
+    },
+
+    partDelete(row) {
+      console.log(this.listAdd)
+      MessageBox.confirm('设备名称：' + row.partName, '确认删除？', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // console.log(this.list2)
+        for (var i = 0; i < this.listAdd.length; i++) {
+          console.log(this.listAdd[i])
+          if (this.listAdd[i].id === row.id) {
+            var listAddIndex = this.listAdd.indexOf(this.listAdd[i])
+          }
+          if (listAddIndex > -1) {
+            this.listAdd.splice(listAddIndex, 1)
+            return
+          }
+        }
+      })
+    },
+    add_dialog_save() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          this.postDataPramas.name = 'insertAppearance'
+          this.postDataPramas.parammaps = this.createTemp
+          this.postDataPramas.parammaps.eqClassId = this.assetTypeid
+          this.postDataPramas.parammaps.eqClassName = this.assetTypename
+
+          var send_data={
+            name:'addFaultdescription',
+            parammaps:{
+              describe:this.createTemp.describe,
+              eqClassId:this.assetTypeid,
+            }
+          }
+          PostDataByName(send_data).then(response => {
+            console.log('新增保存发送参数', this.postDataPramas)
+            if (response.msg === 'fail') {
+              this.$notify({
+                title: '保存失败',
+                message: response.data,
+                type: 'warning',
+                duration: 2000
+              })
+            } else {
+              this.dialogFormVisible = false
+              this.get_table_data()
+              this.$notify({
+                title: '',
+                message: '保存成功',
+                type: 'success',
+                duration: 2000
+              })
+            }
+          })
+        }
+      })
+    },
+    add_dialog_save_again() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          this.postDataPramas.name = 'insertAppearance'
+          this.postDataPramas.parammaps = this.createTemp
+          this.postDataPramas.parammaps.eqClassId = this.assetTypeid
+          this.postDataPramas.parammaps.eqClassName = this.assetTypename
+
+          var send_data={
+            name:'addFaultdescription',
+            parammaps:{
+              describe:this.createTemp.describe,
+              eqClassId:this.assetTypeid,
+            }
+          }
+          PostDataByName(send_data).then(response => {
+            console.log('新增保存发送参数', send_data)
+            if (response.msg === 'fail') {
+              this.$notify({
+                title: '保存失败',
+                message: response.data,
+                type: 'warning',
+                duration: 2000
+              })
+            } else {
+              this.resetCreateTemp()
+              console.log(this.dialogStatus)
+          
+              this.$notify({
+                title: '',
+                message: '保存成功',
+                type: 'success',
+                duration: 2000
+              })
+            }
+          })
+        }
+      })
+    },
+     
+ 
+   
+    
+    form_edit(row) {
+      console.log(row)
+      this.seeTemp = Object.assign({}, row)
+      this.dialogStatusSee = 'update'
+      this.isDisplay = true
+      this.update = true
+      this.see = false
+      this.dialogFormVisibleSee = true
+      this.getdataListParmSee.parammaps.id = row.id
+      this.get_table_dataSee()
+    },
+    updateSave(row) {
+      if (row.describe !== '' && row.describe !== null && row.describe !== undefined) {
+        this.postUpdatePramas.name = 'updateAppearance'
+        this.postUpdatePramas.parammaps = row
+        PostDataByName(this.postUpdatePramas).then(response => {
+          console.log('新增保存发送参数', this.postDataPramas)
+          if (response.msg === 'fail') {
+            this.$notify({
+              title: '保存失败',
+              message: response.data,
+              type: 'warning',
+              duration: 2000
+            })
+          } else {
+            this.$notify({
+              title: '',
+              message: '保存成功',
+              type: 'success',
+              duration: 2000
+            })
+          }
+        })
+      } else {
+        this.$message({
+          message: '请完善保养内容',
+          type: 'warning',
+          duration: 2000
+        })
+      }
+    },
+    updateDelete(row) {
+      console.log(row)
+      MessageBox.confirm('确认是否删除当前信息?', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.postUpdatePramas.name = 'delFaultdescription'
+        this.postUpdatePramas.parammaps = {}
+        this.postUpdatePramas.parammaps.id = row.id
+        PostDataByName(this.postUpdatePramas).then(response => {
+          console.log('新增保存发送参数', this.postDataPramas)
+          if (response.msg === 'fail') {
+            this.$notify({
+              title: '保存失败',
+              message: response.data,
+              type: 'warning',
+              duration: 2000
+            })
+          } else {
+            this.get_table_data()
+            this.get_table_dataSee()
+            this.$notify({
+              title: '',
+              message: '保存成功',
+              type: 'success',
+              duration: 2000
+            })
+          }
+        })
+      })
+    },
+   
+    addFaultData() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['createTemp'].validate(valid => {
+        if (valid) {
+          this.postDataPramas.name = 'insertAppearance'
+          this.postDataPramas.parammaps = this.createTemp
+          this.postDataPramas.parammaps.eqClassId = this.assetTypeid
+          this.postDataPramas.parammaps.eqClassName = this.assetTypename
+          PostDataByName(this.postDataPramas).then(response => {
+            console.log('添加故障保存发送参数', this.postDataPramas)
+            if (response.msg === 'fail') {
+              this.$notify({
+                title: '保存失败',
+                message: response.data,
+                type: 'warning',
+                duration: 2000
+              })
+            } else {
+              this.dialogFormVisible = false
+              this.get_table_data()
+              this.$notify({
+                title: '',
+                message: '保存成功',
+                type: 'success',
+                duration: 2000
+              })
+            }
+          })
+        }
+      })
+    },
+    beforeImportExcel(file) {
+      const isLt2M = file.size / 1024 / 1024 < 6
+      if (!isLt2M) {
+        this.$message.error('上传文件大小不能超过 6MB!')
+      }
+      return isLt2M
+    },
+    handleImportExcelSuccess(res, file) {
+      this.get_table_data()
+      if (res.msg === 'ok') {
+        this.$message({
+          title: '成功',
+          message: '导入成功:' + res.data.success + '条!',
+          type: 'success',
+          duration: 2000
+        })
+        if (res.data.err_count > 0) {
+          this.$notify({
+            title: '失败',
+            message: '导入失败:' + res.data.err_count + '条!',
+            type: 'danger',
+            duration: 2000
+          })
+           import('@/vendor/Export2Excel').then(excel => {
+             const list1 = res.data.result
+             const tHeader = [
+               '设备类别名称', '部位', '故障详情', '备注', '报错信息'
+             ]
+             const filterVal = [
+               '设备类别名称', '部位', '故障详情', '备注', 'error_msg'
+             ]
+             const data1 = this.formatJson(filterVal, list1)
+             excel.export_json_to_excel({
+               header: tHeader,
+               data: data1,
+               filename: '故障模板报错信息',
+               autoWidth: true,
+               bookType: 'xlsx'
+             })
+           })
+        }
+      } else {
+        this.$notify({
+          title: '失败',
+          message: '上传失败',
+          type: 'danger',
+          duration: 2000
+        })
+      }
+    },
+ 
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v =>
+        filterVal.map(j => {
+          if (j === 'timestamp') {
+            return parseTime(v[j])
+          } else {
+            return v[j]
+          }
+        })
+      )
+    },
+    // ------------------------------------------------------------------
+    jump() {
+      this.$router.push('/console/menu')
+    }
+  }
+}
+</script>

src/views/asset/template/components/yunxing.vue

@@ -211,7 +211,7 @@ export default {
     assetTypeid(val) {
       if (this.assetTypeid != null) {
         this.getdataListParm.params = [this.assetTypeid]
-        this.getList()
+        this.get_table_data()
       }
     }
   },
@@ -234,7 +234,7 @@ export default {
       })
     },
 
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -274,7 +274,7 @@ export default {
           this.requestParam.parammaps = this.startForm
 
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible_st = false
             this.$notify({
               title: '成功',
@@ -298,7 +298,7 @@ export default {
             this.$nextTick(() => {
 
             })
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.$notify({
               title: '成功',
@@ -338,7 +338,7 @@ export default {
           this.requestParam.parammaps['smallClass'] = this.startForm.smallClass
           this.requestParam.parammaps['id'] = this.startForm.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.dialogFormVisible_st = false
             this.$notify({
@@ -383,7 +383,7 @@ export default {
         this.requestParam.parammaps = {}
         this.requestParam.parammaps['id'] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible_st = false
           this.$notify({

src/views/asset/template/index.vue

@@ -29,6 +29,7 @@
           <el-tab-pane label="点检模板" name="second"> <Dianjian :asset-typeid="dictid" :asset-typename="typename" /> </el-tab-pane>
           <el-tab-pane label="保养模板" name="third"> <Baoyang :asset-typeid="dictid" /></el-tab-pane>
           <el-tab-pane label="常见故障" name="fourth"><Guzhang :asset-typeid="dictid" :asset-typename="typename" :asset-action="action" /> </el-tab-pane>
+          <el-tab-pane label="描述故障" name="sixth"><Miaoshu :asset-typeid="dictid" :asset-typename="typename" :asset-action="action" /> </el-tab-pane>
           <!--
           <el-tab-pane label="维修部门" name="fifth"><Bumeng :asset-typeid="dictid" :type-number="checkNumber" :dept-id="deptId" /> </el-tab-pane> -->
           <!-- :asset-checknumber="checkNumber" -->
@@ -48,12 +49,13 @@ import Buwei from './components/buwei' // secondary package based on el-paginati
 import Dianjian from './components/dianjian' // secondary package based on el-pagination
 import Baoyang from './components/baoyang' // secondary package based on el-pagination
 import Guzhang from './components/guzhang' // secondary package based on el-
+import Miaoshu from './components/miaoshu'
 // import Bumeng from './components/bumeng' // secondary package based on el-pagination
 // import Yunxing from './components/yunxing' // secondary package based on el-pagination
 export default {
   name: 'Template',
   // components: { Buwei, , Baoyang, Guzhang, Bumeng },
-  components: { Buwei, Dianjian, Baoyang, Guzhang },
+  components: { Buwei, Dianjian, Baoyang, Guzhang, Miaoshu },
   data() {
     return {
       rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },

src/views/basic/assetStandardManagement/index.vue

@@ -85,7 +85,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="get_table_data" />
 
   </div>
 </template>
@@ -125,7 +125,7 @@ export default {
   created() {
     this.getDownDeptList()
     this.getEquipmentCategoryList()
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     getDownDeptList() {
@@ -160,7 +160,7 @@ export default {
         this.table.getdataListParm.eqClassId = ''
       }
     },
-    getList() {
+    get_table_data() {
       this.table.listLoading = true
       Equipment(this.table.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -195,7 +195,7 @@ export default {
     form_search() {
       this.table.listLoading = true
       this.table.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_add() {
       console.log('新增')
@@ -308,7 +308,7 @@ export default {
         updateAndInster(this.postDataParm).then(response => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
-            this.getList()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: '新增失败-' + response.data, type: 'danger', duration: 2000 })
           }
@@ -351,7 +351,7 @@ export default {
       console.log('编辑保存', this.postDataParm)
       updateAndInster(this.postDataParm).then(response => {
         if (response.msg !== 'fail') {
-          this.getList()
+          this.get_table_data()
           this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
         } else {
           this.$notify({ title: '失败', message: '失败-' + response.data, type: 'danger', duration: 2000 })
@@ -364,7 +364,7 @@ export default {
       row.isCreate = false
       row.isUpdate = true
       row.isUpdateSave = false
-      this.getList()
+      this.get_table_data()
     },
     handleRowDelete(row) {
       MessageBox.confirm('是否确认删除此信息?', {
@@ -376,7 +376,7 @@ export default {
         this.postDataParm.param = row
         updateAndInster(this.postDataParm).then(response => {
           if (response.msg !== 'fail') {
-            this.getList()
+            this.get_table_data()
             this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
           } else {
             this.$notify({ title: '失败', message: '删除失败-' + response.data, type: 'danger', duration: 2000 })

src/views/basic/brand/index.vue

@@ -77,7 +77,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="50%">
       <el-form ref="temp" :rules="rules" :model="temp" label-position="right" label-width="100px" style="width: 90%; margin-left:50px;">
@@ -295,7 +295,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -332,7 +332,7 @@ export default {
       console.log(item)
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -358,7 +358,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -390,7 +390,7 @@ export default {
           // console.log('牧场主键:'+this.temp.pastureId)
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -419,7 +419,7 @@ export default {
               this.$refs['temp'].clearValidate()
             })
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -470,7 +470,7 @@ export default {
       UpdateDataRelation(this.UpdateDataRelationParam).then(response => {
         if (response.msg !== 'fail') {
           this.dialogeqVisible = false
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '修改成功',
@@ -519,7 +519,7 @@ export default {
       UpdateDataRelation(this.UpdateDataRelationParam).then(response => {
         if (response.msg !== 'fail') {
           this.dialogstockVisible = false
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '修改成功',
@@ -547,7 +547,7 @@ export default {
           this.requestParam.parammaps = this.temp
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.$notify({
                 title: '成功',
                 message: '修改成功',
@@ -572,7 +572,7 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg !== 'fail') {
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '成功',
               message: '删除成功',

src/views/basic/maintenanceWorkerCategory/index.vue

@@ -37,7 +37,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="get_table_data" />
 
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="50%">
         <el-form ref="createTemp" :rules="rules" :model="create.temp" label-position="right" label-width="150px">
@@ -66,7 +66,7 @@
         <div slot="footer" class="dialog-footer">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </el-dialog>
     </div>
@@ -108,7 +108,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
     this.get_auto_buttons()
   },
 
@@ -126,7 +126,7 @@ export default {
       const isWorkerUpdate = checkButtons(this.$store.state.user.buttons, WorkerUpdate)
       this.isWorkerUpdate = isWorkerUpdate
     },
-    getList() {
+    get_table_data() {
       this.table.listLoading = true
       GetDataByName(this.table.getdataListParm).then(response => {
         this.table.list = response.data.list
@@ -153,7 +153,7 @@ export default {
           this.requestParam.parammaps = this.create.temp
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.create.dialogFormVisible = false
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
             } else {

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

@@ -47,7 +47,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <!-- 新增油卡 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="50%">
@@ -102,7 +102,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
 
@@ -143,7 +143,7 @@
           type="success"
           @click="createChange()"
         >换卡</el-button>
-        <el-button @click="changeFormVisible = false;getList()">取消并关闭</el-button>
+        <el-button @click="changeFormVisible = false;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
     <!-- 弹出层新增or修改 -->
@@ -258,7 +258,7 @@
           type="success"
           @click="createRecharge()"
         >充值</el-button>
-        <el-button @click="rechargeFormVisible = false;getList()">取消并关闭</el-button>
+        <el-button @click="rechargeFormVisible = false;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
 
@@ -487,7 +487,7 @@ export default {
 
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -523,7 +523,7 @@ export default {
       console.log(item)
     },
 
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -554,7 +554,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
 
     handleModifyStatus(row, status) {
@@ -588,7 +588,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '失败', message: '保存失败-' + response.data, type: 'danger', duration: 2000 })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
             }
@@ -647,7 +647,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.getList()
+              this.get_table_data()
               this.getchangedataListParmList()
               this.changeFFormVisible = false
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
@@ -681,7 +681,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.getList()
+              this.get_table_data()
               this.getrechargedataListParmList()
               this.rechargeFFormVisible = false
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
@@ -744,7 +744,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '失败', message: '保存失败-' + response.data, type: 'warning', duration: 2000 })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
             }
@@ -783,7 +783,7 @@ export default {
         this.requestParam.parammaps = {}
         this.requestParam.parammaps['id'] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
         })
@@ -832,7 +832,7 @@ export default {
     },
 
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {

src/views/basic/otherinfo/index.vue

@@ -63,7 +63,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="50%">
       <el-form ref="temp" :rules="rules" :model="temp" label-position="right" label-width="100px" style="width: 800px; margin-left:50px;">
         <el-row>
@@ -118,7 +118,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
 
@@ -161,7 +161,7 @@
         <el-table-column label="操作人" align="center" min-width="110px" prop="personName" />
       </el-table>
       <div slot="footer" class="dialog-footer" style="bottom:10px">
-        <el-button @click="changeFormVisible = false;getList()">关闭</el-button>
+        <el-button @click="changeFormVisible = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -202,7 +202,7 @@
       </el-table>
       <div slot="footer" class="dialog-footer" style="bottom:10px">
         <el-button v-if="rechargeTemp.enable == 0" type="success" @click="createRecharge()">充值</el-button>
-        <el-button @click="rechargeFormVisible = false;getList()">取消并关闭</el-button>
+        <el-button @click="rechargeFormVisible = false;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
 
@@ -382,7 +382,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getDepartDownList()
   },
 
@@ -425,7 +425,7 @@ export default {
       console.log(item)
     },
 
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -476,7 +476,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
 
     handleModifyStatus(row, status) {
@@ -547,7 +547,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '失败', message: '保存失败-' + response.data, type: 'danger', duration: 2000 })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
             }
@@ -641,7 +641,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.getList()
+              this.get_table_data()
               this.getrechargedataListParmList()
               this.rechargeFFormVisible = false
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
@@ -792,7 +792,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '失败', message: '保存失败-' + response.data, type: 'danger', duration: 2000 })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
             }
@@ -832,7 +832,7 @@ export default {
           if (response.msg === 'fail') {
             this.$notify({ title: '失败', message: '失败' + response.data, type: 'danger', duration: 2000 })
           } else {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
           }
@@ -858,7 +858,7 @@ export default {
               if (response.msg == 'fail') {
                 this.$notify({ title: '失败', message: '失败' + response.data, type: 'danger', duration: 2000 })
               } else {
-                this.getList()
+                this.get_table_data()
                 this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
               }
             })
@@ -913,7 +913,7 @@ export default {
     },
 
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {

src/views/basic/product/index.vue

@@ -97,7 +97,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="80%">
       <div class="content-add">
@@ -517,7 +517,7 @@ export default {
       that.get_auto_buttons()
     })
     // this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getStockList()
     this.geteqList()
     this.getTypeList()
@@ -575,7 +575,7 @@ export default {
       console.log(item)
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -605,7 +605,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -640,7 +640,7 @@ export default {
           // console.log('牧场主键:'+this.temp.pastureId)
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -690,7 +690,7 @@ export default {
 
       UpdateDataRelation(this.UpdateDataRelationParam).then(response => {
         if (response.msg !== 'fail') {
-          this.getList()
+          this.get_table_data()
           this.dialogeqVisible = false
           this.$notify({
             title: '成功',
@@ -943,7 +943,7 @@ export default {
 
       UpdateDataRelation(this.UpdateDataRelationParam).then(response => {
         if (response.msg !== 'fail') {
-          this.getList()
+          this.get_table_data()
           this.dialogstockVisible = false
 
           this.$notify({
@@ -977,7 +977,7 @@ export default {
     //         duration: 2000
     //       })
     //       this.dialogwarehouseVisible = false
-    //       this.getList()
+    //       this.get_table_data()
     //     } else {
     //       failproccess(response, this.$notify)
     //     }
@@ -1007,7 +1007,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -1077,7 +1077,7 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps['id'] = row.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
@@ -1102,7 +1102,7 @@ export default {
       PostDataByName(this.requestParam).then(response => { // 响应信息处理
         if (response.msg !== 'fail') {
           this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-          this.getList()
+          this.get_table_data()
         } else {
           failproccess(response, this.$notify)
         }
@@ -1123,7 +1123,7 @@ export default {
         if (response.msg == 'fail') {
           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.getList()
+          this.get_table_data()
           this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
         }
       })

src/views/basic/productclass/index.vue

@@ -47,7 +47,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
         <el-form ref="dataForm" v-enterToNext="true" :rules="rules" :model="dataform" label-position="left" label-width="100px" style="width: 600px; margin-left:50px;">
@@ -137,10 +137,10 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -178,7 +178,7 @@ export default {
           this.requestParam.params[1] = this.dataform.name
           this.requestParam.params[2] = this.dataform.address
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
@@ -202,7 +202,7 @@ export default {
             this.$nextTick(() => {
               this.$refs['productclass'].focus()
             })
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.$notify({
               title: '成功',
@@ -236,7 +236,7 @@ export default {
           this.requestParam.params[2] = this.dataform.address
           this.requestParam.params[3] = this.dataform.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.dialogFormVisible = false
             this.$notify({
@@ -275,7 +275,7 @@ export default {
         this.requestParam.params = []
         this.requestParam.params[0] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({

src/views/basic/standardStock/index.vue

@@ -77,7 +77,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="get_table_data" />
 
   </div>
 </template>
@@ -136,7 +136,7 @@ export default {
   },
   created() {
     this.getEquipmentCategoryList()
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     getEquipmentCategoryList() {
@@ -162,7 +162,7 @@ export default {
         this.table.getdataListParm.partClassId = ''
       }
     },
-    getList() {
+    get_table_data() {
       this.table.listLoading = true
       StandardPart(this.table.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -197,7 +197,7 @@ export default {
     form_search() {
       this.table.listLoading = true
       this.table.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_add() {
       console.log('新增')
@@ -286,7 +286,7 @@ export default {
         updateAndInster(this.postDataParm).then(response => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
-            this.getList()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: '新增失败-' + response.data, type: 'danger', duration: 2000 })
           }
@@ -346,7 +346,7 @@ export default {
       console.log('编辑保存', this.postDataParm)
       updateAndInster(this.postDataParm).then(response => {
         if (response.msg !== 'fail') {
-          this.getList()
+          this.get_table_data()
           this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
         } else {
           this.$notify({ title: '失败', message: '失败-' + response.data, type: 'danger', duration: 2000 })
@@ -359,7 +359,7 @@ export default {
       row.isCreate = false
       row.isUpdate = true
       row.isUpdateSave = false
-      this.getList()
+      this.get_table_data()
     },
     handleRowDelete(row) {
       MessageBox.confirm('是否确认删除此信息?', {
@@ -372,7 +372,7 @@ export default {
         this.postDataParm.param = row
         updateAndInster(this.postDataParm).then(response => {
           if (response.msg !== 'fail') {
-            this.getList()
+            this.get_table_data()
             this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
           } else {
             this.$notify({ title: '失败', message: '删除失败-' + response.data, type: 'danger', duration: 2000 })

src/views/basic/warehouse/index.vue

@@ -135,7 +135,7 @@
         :total="total"
         :page.sync="getDeptListParm.offset"
         :limit.sync="getDeptListParm.pagecount"
-        @pagination="getList"
+        @pagination="get_table_data"
       />
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
         <el-form ref="dataForm" :rules="rules" :model="deptform" label-position="left" label-width="100px" style="width: 90%; margin-left:50px;">
@@ -164,7 +164,7 @@
         <div slot="footer" class="dialog-footer">
           <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;get_table_data();"> 取消并关闭 </el-button>
         </div>
       </el-dialog>
     </div>
@@ -273,7 +273,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
@@ -304,7 +304,7 @@ export default {
         this.$refs['remark'].focus()
       }) */
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true // 列表加载
       GetDataByName(this.getDeptListParm).then(response => {
         this.list = response.data
@@ -330,7 +330,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getDeptListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     querySearchWarehoseCode(queryString, cb) {
       console.log('库位编号模糊查询输入值', queryString)
@@ -412,7 +412,7 @@ export default {
           }
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
             } else {
@@ -486,7 +486,7 @@ export default {
 
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -530,7 +530,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({
           title: '成功',
@@ -636,7 +636,7 @@ export default {
         }
         PostDataByName(this.requestParam).then(response => {
           if (response.msg !== 'fail') {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',

src/views/business/visit/index.vue

@@ -83,7 +83,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
@@ -194,7 +194,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
 
   mounted() {
@@ -204,7 +204,7 @@ export default {
   },
 
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -217,7 +217,7 @@ export default {
     },
     form_search() {
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({

src/views/console/apisql/index.vue

@@ -8,7 +8,7 @@
             <el-col :span="12" style="text-align: left; vertical-align:middle; font-size: 20px">  <span>菜单 </span></el-col>
             <el-col :span="6"> <el-col :span="6">  <el-button type="warning" icon="el-icon-edit" size="mini" @click="jump" /></el-col>
             </el-col>
-            <el-col :span="6">  <el-button type="primary" icon="el-icon-refresh" size="mini" @click="getList()" /></el-col>
+            <el-col :span="6">  <el-button type="primary" icon="el-icon-refresh" size="mini" @click="get_table_data()" /></el-col>
           </el-row>
         </div>
         <div class="component-item">
@@ -111,7 +111,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+        <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
           <el-form ref="dataForm" :rules="rules" :model="deptform" label-position="left" label-width="100px" style="width: 90%; margin-left:50px;">
@@ -288,7 +288,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     menu_popoverHide(checkedIds, checkedData) {
@@ -383,7 +383,7 @@ export default {
         this.$refs['remark'].focus()
       })
     },
-    getList() {
+    get_table_data() {
       this.menuid = 0
       this.listLoading = true
       this.get_select_list()
@@ -452,7 +452,7 @@ export default {
           this.requestParam.params[9] = this.deptform.request_body
           this.requestParam.params[10] = this.deptform.return_body
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
@@ -486,7 +486,7 @@ export default {
             this.$nextTick(() => {
               this.$refs['sqlname'].focus()
             })
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.$notify({
               title: '成功',
@@ -543,7 +543,7 @@ export default {
           this.requestParam.params[10] = this.deptform.return_body
           this.requestParam.params[11] = this.deptform.sqlid
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.dialogFormVisible = false
             this.$notify({
@@ -586,7 +586,7 @@ export default {
       this.requestParam.params = []
       this.requestParam.params[0] = row.id
       PostDataByName(this.requestParam).then(() => {
-        this.getList()
+        this.get_table_data()
         this.resetRequestParam()
         this.dialogFormVisible = false
         this.$notify({
@@ -607,7 +607,7 @@ export default {
         this.requestParam.params = []
         this.requestParam.params[0] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({

src/views/console/assetType/index.vue

@@ -99,7 +99,7 @@
         <div slot="footer" class="dialog-footer">
           <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;get_table_data();"> 取消并关闭 </el-button>
         </div>
       </el-dialog>
     </div>
@@ -176,7 +176,7 @@ export default {
       that.buttons = response.data.list
       that.get_auto_buttons()
     })
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     tableSort(column) {
@@ -201,7 +201,7 @@ export default {
       }
       this.getMaxCode()
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getDeptListParm).then(response => {
         this.list = response.data
@@ -294,7 +294,7 @@ export default {
 
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
             } else {
@@ -377,7 +377,7 @@ export default {
 
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -509,7 +509,7 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg !== 'fail') {
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '成功',
               message: '删除成功',

src/views/console/dept/index.vue

@@ -129,7 +129,7 @@
         <div slot="footer" class="dialog-footer">
           <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;get_table_data()"> 关闭 </el-button>
         </div>
       </el-dialog>
     </div>
@@ -196,7 +196,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     popoverHide(checkedIds, checkedData) {
@@ -209,7 +209,7 @@ export default {
         this.$refs['remark'].focus()
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
 
       GetDataByName(this.getDepartListParm).then(response => {
@@ -291,7 +291,7 @@ export default {
           this.requestParam.parammaps.isPasture = this.deptform.isPasture
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -324,7 +324,7 @@ export default {
             this.$nextTick(() => {
               this.$refs['deptname'].focus()
             })
-            this.getList()
+            this.get_table_data()
             this.requestParam = {
               name: 'createdept',
               params: []
@@ -382,7 +382,7 @@ export default {
           this.requestParam.params[8] = this.deptform.id
 
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
@@ -428,7 +428,7 @@ export default {
         this.requestParamDel.params = []
         this.requestParamDel.params[0] = row.id
         PostDataByName(this.requestParamDel).then(() => {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({
             title: '成功',

src/views/console/dict/index.vue

@@ -93,7 +93,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
         <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
           <el-form
@@ -220,7 +220,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     jump() {
@@ -251,7 +251,7 @@ export default {
         this.parent = response.data
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       this.get_select_list()
       GetDataByName(this.getdataListParm).then(response => {
@@ -295,7 +295,7 @@ export default {
           this.requestParam.params[3] = this.deptform.enable
           this.requestParam.params[4] = this.dictid
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
@@ -321,7 +321,7 @@ export default {
             this.$nextTick(() => {
               this.$refs['label'].focus()
             })
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.deptform.orderby = '0'
             this.deptform.enable = 1
@@ -361,7 +361,7 @@ export default {
           this.requestParam.params[4] = this.dictid
           this.requestParam.params[5] = this.deptform.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.dialogFormVisible = false
             this.$notify({
@@ -403,7 +403,7 @@ export default {
         this.requestParam.params = []
         this.requestParam.params[0] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({

src/views/console/emp/index.vue

@@ -97,7 +97,7 @@
         :total="total"
         :page.sync="getdataListParm.offset"
         :limit.sync="getdataListParm.pagecount"
-        @pagination="getList"
+        @pagination="get_table_data"
       />
 
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
@@ -161,7 +161,7 @@
         <div slot="footer" class="dialog-footer">
           <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;get_table_data()">关闭</el-button>
         </div>
       </el-dialog>
     </div>
@@ -288,7 +288,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
     this.get_auto_buttons()
   },
 
@@ -322,7 +322,7 @@ export default {
         this.$refs['remark'].focus()
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -349,7 +349,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
 
     getDeptList() {
@@ -404,7 +404,7 @@ export default {
 
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
             } else {
@@ -442,7 +442,7 @@ export default {
 
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.resetRequestParam()
               this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
             } else {
@@ -485,7 +485,7 @@ export default {
           this.requestParam.parammaps.empCode = this.dataform.empCode
           this.requestParam.parammaps.id = this.dataform.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.dialogFormVisible = false
           })
@@ -539,7 +539,7 @@ export default {
         // this.requestParam.params[1] = this.$store.state.user.pastureid
         PostDataByName(this.requestParam).then(response => {
           if (response.msg !== 'fail') {
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.dialogFormVisible = false
             this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })

src/views/console/feedings/index.vue

@@ -72,7 +72,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
       <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="140px">
@@ -113,7 +113,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -246,7 +246,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -258,7 +258,7 @@ export default {
         this.findAllPasture = response.data.findAllPasture.list
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -276,7 +276,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetCreateTemp() {
       this.createTemp.pastureId = this.$store.state.user.pastureid
@@ -301,7 +301,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -334,7 +334,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              // this.getList()
+              // this.get_table_data()
               // this.dialogFormVisible = false
               this.resetCreateTemp()
               this.$notify({
@@ -376,7 +376,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -449,7 +449,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({
           title: '成功',
@@ -538,7 +538,7 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps['id'] = row.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',

src/views/console/menu/index.vue

@@ -227,7 +227,7 @@ export default {
         menutype: '',
         enable: ''
       },
-      getListParm: { name: 'getMenuAndButtonRecu' },
+      get_table_dataParm: { name: 'getMenuAndButtonRecu' },
       getRecuListParm: { name: 'getMenuListRecu' },
       getRecuListBParm: { name: 'getMenuListBRecu',
         idname: 'id',
@@ -257,7 +257,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     tableSort(column) {
@@ -271,9 +271,9 @@ export default {
         this.parent = this.parentmenu
       } else { this.parent = this.parentButton }
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
-      GetDataByName(this.getListParm).then(response => {
+      GetDataByName(this.get_table_dataParm).then(response => {
         if (response.data.list !== null) {
           for (var i = 0; i < response.data.list.length; i++) {
             response.data.list[i].enable = parseInt(response.data.list[i].enable)
@@ -348,7 +348,7 @@ export default {
           this.requestParam.params[8] = this.deptform.menutype
           this.requestParam.params[9] = this.deptform.enable
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
@@ -380,7 +380,7 @@ export default {
             this.$nextTick(() => {
               this.$refs['name'].focus()
             })
-            this.getList()
+            this.get_table_data()
             this.requestParam = {
               name: 'createMenu',
               params: []
@@ -435,7 +435,7 @@ export default {
           this.requestParam.params[10] = this.deptform.id
           console.log(this.requestParam)
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
@@ -480,7 +480,7 @@ export default {
         this.requestParam.params = []
         this.requestParam.params[0] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({
             title: '成功',

src/views/console/ranchManagement/index.vue

@@ -44,7 +44,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="get_table_data" />
     </div>
 
     <div class="create">
@@ -124,7 +124,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <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;get_table_data()">关闭</el-button>
         </div>
       </el-dialog>
     </div>
@@ -184,7 +184,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     get_select_list() {
@@ -196,7 +196,7 @@ export default {
         });
       })
     },
-    getList() {
+    get_table_data() {
       this.table.listLoading = true
       GetDataByName(this.table.getdataListParm).then(response => {
         this.table.list = response.data.list
@@ -212,7 +212,7 @@ export default {
     },
     form_search() {
       this.table.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetCreateTemp() {
       this.create.temp.areaId = ''
@@ -262,7 +262,7 @@ export default {
             } else {
               this.create.dialogFormVisible = false
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
+              this.get_table_data()
             }
           })
         }
@@ -307,7 +307,7 @@ export default {
             } else {
               this.create.dialogFormVisible = false
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
+              this.get_table_data()
             }
           })
         }

src/views/console/role/index.vue

@@ -44,7 +44,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
         <el-form ref="dataForm" :rules="rules" :model="dataform" label-position="left" label-width="100px" style="width: 600px; margin-left:50px;">
@@ -64,7 +64,7 @@
         <div slot="footer" class="dialog-footer">
           <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;get_table_data();"> 关闭 </el-button>
         </div>
       </el-dialog>
 
@@ -86,7 +86,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="edit_dialog_saveRole()"> 确认 </el-button>
-          <el-button @click="dialogDataRoleVisible = false;getList()"> 关闭 </el-button>
+          <el-button @click="dialogDataRoleVisible = false;get_table_data()"> 关闭 </el-button>
         </div>
       </el-dialog>
       <el-dialog :title="textMap['menu']" :visible.sync="dialogMenuVisible" :close-on-click-modal="false">
@@ -110,7 +110,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button :disabled="isokDisable" type="primary" @click="updateMenu()"> 确认 </el-button>
-          <el-button @click="dialogMenuVisible = false;getList()"> 关闭 </el-button>
+          <el-button @click="dialogMenuVisible = false;get_table_data()"> 关闭 </el-button>
         </div>
       </el-dialog>
     </div>
@@ -184,7 +184,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
     this.getDepartDownList()
   },
   methods: {
@@ -206,7 +206,7 @@ export default {
         this.findAllDepart = response.data.list
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -251,7 +251,7 @@ export default {
           this.requestParam.params[2] = this.dataform.enable
           this.requestParam.params[3] = this.dataform.easInformationReception
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
@@ -276,7 +276,7 @@ export default {
             this.$nextTick(() => {
               this.$refs['name'].focus()
             })
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.$notify({
               title: '成功',
@@ -350,7 +350,7 @@ export default {
           this.requestParam.params[3] = this.dataform.easInformationReception
           this.requestParam.params[4] = this.dataform.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.resetRequestParam()
             this.dialogFormVisible = false
             this.$notify({
@@ -389,7 +389,7 @@ export default {
         this.requestParam.params = []
         this.requestParam.params[0] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({
@@ -474,7 +474,7 @@ export default {
                     PostDataByName(this.requestParam).then(response => {
                       console.log('设置数据权限保存发送参数', this.requestParam)
                       if (response.msg !== 'fail') {
-                        this.getList()
+                        this.get_table_data()
                         this.dialogDataRoleVisible = false
                         this.$notify({ title: '成功', message: '设置成功', type: 'success', duration: 2000 })
                       } else {
@@ -493,7 +493,7 @@ export default {
             PostDataByName(this.requestParam).then(response => {
               console.log('设置数据权限保存发送参数', this.requestParam)
               if (response.msg !== 'fail') {
-                this.getList()
+                this.get_table_data()
                 this.dialogDataRoleVisible = false
                 this.$notify({ title: '成功', message: '设置成功', type: 'success', duration: 2000 })
               } else {

src/views/console/safetyStock/index.vue

@@ -99,7 +99,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <el-dialog
       :title="textMap[dialogStatus]"
@@ -264,7 +264,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getTypeList()
   },
 
@@ -323,7 +323,7 @@ export default {
         this.getdataListParm.parammaps.classCode = ''
       }
     },
-    getList() {
+    get_table_data() {
       GetDataByName(this.getdataListParm).then(response => {
         console.log('table数据', response.data.list)
         this.list = response.data.list
@@ -338,7 +338,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleSelectionChange(val) {
       console.log('选中值', val)
@@ -384,7 +384,7 @@ export default {
               })
             } else {
               this.dialogFormVisible = false
-              this.getList()
+              this.get_table_data()
               this.$notify({
                 title: '',
                 message: '保存成功',

src/views/console/stockType/index.vue

@@ -112,7 +112,7 @@
         <div slot="footer" class="dialog-footer">
           <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;get_table_data();"> 取消并关闭 </el-button>
         </div>
       </el-dialog>
     </div>
@@ -190,7 +190,7 @@ export default {
       that.buttons = response.data.list
       that.get_auto_buttons()
     })
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     tableSort(column) {
@@ -215,7 +215,7 @@ export default {
       }
       this.getMaxCode()
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getDeptListParm).then(response => {
         this.list = response.data
@@ -296,7 +296,7 @@ export default {
           this.requestParam.parammaps['enable'] = this.deptform.enable
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -383,7 +383,7 @@ export default {
 
           PostDataByName(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -480,7 +480,7 @@ export default {
         this.requestParam.parammaps['id'] = row.id
         PostDataByName(this.requestParam).then(response => {
           if (response.msg !== 'fail') {
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '成功',
               message: '删除成功',

src/views/console/user/index.vue

@@ -63,7 +63,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
       <!-- 编辑 -->
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
@@ -256,7 +256,7 @@ export default {
       that.buttons = response.data.list
       that.get_auto_buttons()
     })
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     tableSort(column) {
@@ -284,7 +284,7 @@ export default {
       const isUserDelete = checkButtons(this.$store.state.user.buttons, isUserDelete)
       this.isUserDelete = isUserDelete
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByNames(this.requestParams).then(response => {
         this.rolelist = response.data.getRoleall.list
@@ -308,7 +308,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetRequestParam() {
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
@@ -383,7 +383,7 @@ export default {
 
                 // 没有记录的内容
                 this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisibleAdd = false
                 // 没有记录的内容
 
@@ -458,13 +458,13 @@ export default {
                       }).then(() => {
                         PostDataByName(send_data3).then(() => {
                           this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-                          this.getList()
+                          this.get_table_data()
                           this.dialogFormVisible = false
                         })
                       })
                     } else {
                       this.dialogFormVisibleAdd = false
-                      this.getList()
+                      this.get_table_data()
                       this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
                     }
                   } else {
@@ -503,7 +503,7 @@ export default {
       UpdateDataRelation(this.UpdateDataRelationParam).then(() => {
         this.dialogRoleVisible = false
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-        this.getList()
+        this.get_table_data()
       })
     },
     form_edit(row) {
@@ -564,7 +564,7 @@ export default {
               this.requestParam2.values = this.dataform.maintenanceTypeId
               UpdateDataRelation(this.requestParam2).then(response => {
                 if (response.msg !== 'fail') {
-                  // this.getList()
+                  // this.get_table_data()
                   // this.dialogFormVisible = false
 
                   var send_data = {
@@ -621,12 +621,12 @@ export default {
                         }).then(() => {
                           PostDataByName(send_data3).then(() => {
                             this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-                            this.getList()
+                            this.get_table_data()
                             this.dialogFormVisible = false
                           })
                         })
                       } else {
-                        this.getList()
+                        this.get_table_data()
                         this.dialogFormVisible = false
                       }
                     } else {
@@ -665,7 +665,7 @@ export default {
         this.requestParam.params = []
         this.requestParam.params[0] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
@@ -695,7 +695,7 @@ export default {
         this.requestParam.parammaps = {}
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '重置密码成功', type: 'success', duration: 2000 })

src/views/console/user/index备份.vue

@@ -62,7 +62,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
       <!-- 编辑 -->
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
@@ -255,7 +255,7 @@ export default {
       that.buttons = response.data.list
       that.get_auto_buttons()
     })
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     tableSort(column) {
@@ -283,7 +283,7 @@ export default {
       const isUserDelete = checkButtons(this.$store.state.user.buttons, isUserDelete)
       this.isUserDelete = isUserDelete
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByNames(this.requestParams).then(response => {
         this.rolelist = response.data.getRoleall.list
@@ -307,7 +307,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetRequestParam() {
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
@@ -382,7 +382,7 @@ export default {
 
                 // 没有记录的内容
                 this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisibleAdd = false
                 // 没有记录的内容
 
@@ -457,13 +457,13 @@ export default {
                       }).then(() => {
                         PostDataByName(send_data3).then(() => {
                           this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-                          this.getList()
+                          this.get_table_data()
                           this.dialogFormVisible = false
                         })
                       })
                     } else {
                       this.dialogFormVisibleAdd = false
-                      this.getList()
+                      this.get_table_data()
                       this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
                     }
                   } else {
@@ -502,7 +502,7 @@ export default {
       UpdateDataRelation(this.UpdateDataRelationParam).then(() => {
         this.dialogRoleVisible = false
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-        this.getList()
+        this.get_table_data()
       })
     },
     form_edit(row) {
@@ -561,7 +561,7 @@ export default {
               this.requestParam2.values = this.dataform.maintenanceTypeId
               UpdateDataRelation(this.requestParam2).then(response => {
                 if (response.msg !== 'fail') {
-                  // this.getList()
+                  // this.get_table_data()
                   // this.dialogFormVisible = false
 
                   var send_data = {
@@ -618,12 +618,12 @@ export default {
                         }).then(() => {
                           PostDataByName(send_data3).then(() => {
                             this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-                            this.getList()
+                            this.get_table_data()
                             this.dialogFormVisible = false
                           })
                         })
                       } else {
-                        this.getList()
+                        this.get_table_data()
                         this.dialogFormVisible = false
                       }
                     } else {
@@ -661,7 +661,7 @@ export default {
         this.requestParam.params = []
         this.requestParam.params[0] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
@@ -691,7 +691,7 @@ export default {
         this.requestParam.parammaps = {}
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '重置密码成功', type: 'success', duration: 2000 })

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

@@ -62,7 +62,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
       <!-- 编辑 -->
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
@@ -253,7 +253,7 @@ export default {
       that.buttons = response.data.list
       that.get_auto_buttons()
     })
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     get_auto_buttons() {
@@ -281,7 +281,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByNames(this.requestParams).then(response => {
         this.rolelist = response.data.getRoleall.list
@@ -301,7 +301,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetRequestParam() {
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
@@ -376,7 +376,7 @@ export default {
 
                 // 没有记录的内容
                 this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisibleAdd = false
                 // 没有记录的内容
 
@@ -451,13 +451,13 @@ export default {
                       }).then(() => {
                         PostDataByName(send_data3).then(() => {
                           this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-                          this.getList()
+                          this.get_table_data()
                           this.dialogFormVisible = false
                         })
                       })
                     } else {
                       this.dialogFormVisibleAdd = false
-                      this.getList()
+                      this.get_table_data()
                       this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
                     }
                   } else {
@@ -496,7 +496,7 @@ export default {
       UpdateDataRelation(this.UpdateDataRelationParam).then(() => {
         this.dialogRoleVisible = false
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-        this.getList()
+        this.get_table_data()
       })
     },
     form_edit(row) {
@@ -547,7 +547,7 @@ export default {
               this.requestParam2.values = this.dataform.maintenanceTypeId
               UpdateDataRelation(this.requestParam2).then(response => {
                 if (response.msg !== 'fail') {
-                  // this.getList()
+                  // this.get_table_data()
                   // this.dialogFormVisible = false
 
                   var send_data = {
@@ -604,12 +604,12 @@ export default {
                         }).then(() => {
                           PostDataByName(send_data3).then(() => {
                             this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-                            this.getList()
+                            this.get_table_data()
                             this.dialogFormVisible = false
                           })
                         })
                       } else {
-                        this.getList()
+                        this.get_table_data()
                         this.dialogFormVisible = false
                       }
                     } else {
@@ -647,7 +647,7 @@ export default {
         this.requestParam.params = []
         this.requestParam.params[0] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
@@ -677,7 +677,7 @@ export default {
         this.requestParam.parammaps = {}
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '重置密码成功', type: 'success', duration: 2000 })

src/views/console/user/index改好.vue

@@ -62,7 +62,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
       <!-- 编辑 -->
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
@@ -253,7 +253,7 @@ export default {
       that.buttons = response.data.list
       that.get_auto_buttons()
     })
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     get_auto_buttons() {
@@ -281,7 +281,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.list)
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByNames(this.requestParams).then(response => {
         this.rolelist = response.data.getRoleall.list
@@ -301,7 +301,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetRequestParam() {
       this.dataform = { username: '', fullname: '', empid: '', id: '', empname: '', position: '', sort: '', enable: 1, selectedRole: '',selectedRole2:'', maintenancePerson: 1, keeper: 1, maintenanceTypeId: '' }
@@ -376,7 +376,7 @@ export default {
 
                 // 没有记录的内容
                 this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisibleAdd = false
                 // 没有记录的内容
 
@@ -451,13 +451,13 @@ export default {
                       }).then(() => {
                         PostDataByName(send_data3).then(() => {
                           this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-                          this.getList()
+                          this.get_table_data()
                           this.dialogFormVisible = false
                         })
                       })
                     } else {
                       this.dialogFormVisibleAdd = false
-                      this.getList()
+                      this.get_table_data()
                       this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
                     }
                   } else {
@@ -496,7 +496,7 @@ export default {
       UpdateDataRelation(this.UpdateDataRelationParam).then(() => {
         this.dialogRoleVisible = false
         this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-        this.getList()
+        this.get_table_data()
       })
     },
     form_edit(row) {
@@ -547,7 +547,7 @@ export default {
               this.requestParam2.values = this.dataform.maintenanceTypeId
               UpdateDataRelation(this.requestParam2).then(response => {
                 if (response.msg !== 'fail') {
-                  // this.getList()
+                  // this.get_table_data()
                   // this.dialogFormVisible = false
 
                   var send_data = {
@@ -604,12 +604,12 @@ export default {
                         }).then(() => {
                           PostDataByName(send_data3).then(() => {
                             this.$notify({ title: '成功', message: '修改成功', type: 'success', duration: 2000 })
-                            this.getList()
+                            this.get_table_data()
                             this.dialogFormVisible = false
                           })
                         })
                       } else {
-                        this.getList()
+                        this.get_table_data()
                         this.dialogFormVisible = false
                       }
                     } else {
@@ -647,7 +647,7 @@ export default {
         this.requestParam.params = []
         this.requestParam.params[0] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
@@ -677,7 +677,7 @@ export default {
         this.requestParam.parammaps = {}
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.resetRequestParam()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '重置密码成功', type: 'success', duration: 2000 })

src/views/cost/budget/index.vue

@@ -81,7 +81,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList();tableSort()" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data();tableSort()" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
       <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="120px">
@@ -140,7 +140,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -304,7 +304,7 @@ export default {
         this.findAllPasture = response.data.findAllPasture.list
         // this.findAllDepart = response.data.findAllDepart.list
         this.getDepartDownList()
-        this.getList()
+        this.get_table_data()
       })
     },
     getDepartDownList() {
@@ -317,7 +317,7 @@ export default {
       this.getdataListParm.parammaps.departName = ''
       this.getDepartDownList()
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -357,7 +357,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetCreateTemp() {
       this.createTemp.pastureId = this.$store.state.user.pastureid
@@ -403,7 +403,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -485,7 +485,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
             } else {
@@ -553,7 +553,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({
           title: '成功',
@@ -657,7 +657,7 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps['id'] = row.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',

src/views/cost/diesel/index.vue

@@ -111,7 +111,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
@@ -219,7 +219,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
     <!-- 用量记录 -->
@@ -300,7 +300,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" :disabled="isokDisable" @click="deleteData()">确认</el-button>
-        <el-button @click="dialogFormDelete = false;getList()">关闭</el-button>
+        <el-button @click="dialogFormDelete = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -488,7 +488,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -778,7 +778,7 @@ export default {
     },
 
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list == null) {
@@ -834,7 +834,7 @@ export default {
       //   this.getdataListParm.parammaps.selTime = ''
       // }
 
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -910,7 +910,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1015,7 +1015,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1050,7 +1050,7 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps['id'] = row.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',
@@ -1093,7 +1093,7 @@ export default {
             } else {
               this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
               this.dialogFormDelete = false
-              this.getList()
+              this.get_table_data()
             }
           })
         }

src/views/cost/elec/index.vue

@@ -121,7 +121,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
       <el-form ref="temp" :rules="rules" :model="temp" label-position="right" label-width="110px">
@@ -212,7 +212,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
     <!-- 用量记录 -->
@@ -293,7 +293,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" :disabled="isokDisable" @click="deleteData()">确认</el-button>
-        <el-button @click="dialogFormDelete = false;getList()">关闭</el-button>
+        <el-button @click="dialogFormDelete = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -486,7 +486,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -605,7 +605,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
@@ -729,7 +729,7 @@ export default {
       this.temp.rate = ''
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list == null) {
@@ -774,7 +774,7 @@ export default {
       if(this.getdataListParm.parammaps.createDate == null){
         this.getdataListParm.parammaps.createDate =''
       }
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -883,7 +883,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1003,7 +1003,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1036,7 +1036,7 @@ export default {
             } else {
               this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
               this.dialogFormDelete = false
-              this.getList()
+              this.get_table_data()
             }
           })
         }

src/views/cost/gas/index.vue

@@ -68,7 +68,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
@@ -157,7 +157,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
 
@@ -216,7 +216,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" :disabled="isokDisable" @click="deleteData()">确认</el-button>
-        <el-button @click="dialogFormDelete = false;getList()">关闭</el-button>
+        <el-button @click="dialogFormDelete = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -335,7 +335,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -444,7 +444,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
@@ -558,7 +558,7 @@ export default {
       this.temp.measureId = ''
       this.temp.pastureId = ''
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list == null) {
@@ -598,7 +598,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({ message: '操作成功', type: 'success' })
@@ -693,7 +693,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
             }
@@ -787,7 +787,7 @@ export default {
             if (response.msg === 'fail') {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
             }
@@ -815,7 +815,7 @@ export default {
             } else {
               this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
               this.dialogFormDelete = false
-              this.getList()
+              this.get_table_data()
             }
           })
         }

src/views/cost/generation/index.vue

@@ -60,7 +60,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="get_table_data" />
     </div>
     <el-dialog :title="textMap[create.dialogStatus]" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false">
       <el-form ref="temp" :rules="create.rules" :model="create.temp" label-position="right" label-width="110px">
@@ -122,7 +122,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -206,7 +206,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     get_auto_buttons() {
@@ -227,7 +227,7 @@ export default {
       const isGenerationEdit = checkButtons(this.$store.state.user.buttons, GenerationEdit)
       this.isGenerationEdit = isGenerationEdit
     },
-    getList() {
+    get_table_data() {
       this.table.listLoading = true
       GetDataByName(this.table.getdataListParm).then(response => {
         if (response.data.list == null) {
@@ -243,7 +243,7 @@ export default {
       })
     },
     form_search() {
-      this.getList()
+      this.get_table_data()
     },
     get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
@@ -263,7 +263,7 @@ export default {
       this.getDepartDownList()
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {

src/views/cost/methane/index.vue

@@ -205,7 +205,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <!-- 弹出层新增or修改 -->
     <el-dialog
@@ -342,7 +342,7 @@
           @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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -513,7 +513,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -638,7 +638,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       //  if (res.msg === 'ok') {
       if (res.msg === 'ok') {
         this.$message({
@@ -778,7 +778,7 @@ export default {
       this.temp.pastureId = ''
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -806,7 +806,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -887,7 +887,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -945,7 +945,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -981,7 +981,7 @@ export default {
           //       duration: 2000
           //     })
           //   } else {
-          //     this.getList()
+          //     this.get_table_data()
           //     this.dialogFormVisible = false
           //     this.$notify({
           //       title: '成功',
@@ -1024,7 +1024,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1047,7 +1047,7 @@ export default {
         this.requestParam.parammaps = {}
         this.requestParam.parammaps['id'] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({
             title: '成功',

src/views/cost/other/index.vue

@@ -209,7 +209,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
   </div>
 </template>
@@ -329,13 +329,13 @@ export default {
   },
 
   created() {
-    this.getList()
+    this.get_table_data()
     this.get_select_list()
   },
 
   methods: {
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -504,7 +504,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_reset() {}
   }

src/views/cost/steam/index.vue

@@ -121,7 +121,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
       <el-form ref="temp" :rules="rules" :model="temp" label-position="right" label-width="105px">
@@ -211,7 +211,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
     <!-- 用量记录 -->
@@ -293,7 +293,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" :disabled="isokDisable" @click="deleteData()">确认</el-button>
-        <el-button @click="dialogFormDelete = false;getList()">关闭</el-button>
+        <el-button @click="dialogFormDelete = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -487,7 +487,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -617,7 +617,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       //  if (res.msg === 'ok') {
       if (res.msg === 'ok') {
         this.$message({
@@ -763,7 +763,7 @@ export default {
       this.temp.pastureId = ''
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list == null) {
@@ -804,7 +804,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -912,7 +912,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1010,7 +1010,7 @@ export default {
           //       duration: 2000
           //     })
           //   } else {
-          //     this.getList()
+          //     this.get_table_data()
           //     this.dialogFormVisible = false
           //     this.$notify({
           //       title: '成功',
@@ -1055,7 +1055,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1088,7 +1088,7 @@ export default {
             } else {
               this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
               this.dialogFormDelete = false
-              this.getList()
+              this.get_table_data()
             }
           })
         }

src/views/cost/water/index.vue

@@ -111,7 +111,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
       <el-form ref="temp" :rules="rules" :model="temp" label-position="right" label-width="110px">
@@ -201,7 +201,7 @@
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">取消并关闭</el-button>
       </div>
     </el-dialog>
     <!-- 用量记录 -->
@@ -283,7 +283,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" :disabled="isokDisable" @click="deleteData()">确认</el-button>
-        <el-button @click="dialogFormDelete = false;getList()">关闭</el-button>
+        <el-button @click="dialogFormDelete = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -476,7 +476,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -590,7 +590,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({
           title: '成功',
@@ -736,7 +736,7 @@ export default {
       this.temp.pastureId = ''
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list == null) {
@@ -776,7 +776,7 @@ export default {
     },
     form_search() {
       this.listLoading = true
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -887,7 +887,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1007,7 +1007,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1041,7 +1041,7 @@ export default {
             } else {
               this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
               this.dialogFormDelete = false
-              this.getList()
+              this.get_table_data()
             }
           })
         }

src/views/custom/allot/index.vue

@@ -83,7 +83,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="app-container">
@@ -262,7 +262,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -555,7 +555,7 @@ export default {
 
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   watch: {
@@ -617,7 +617,7 @@ export default {
               if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
-                that.getList()
+                that.get_table_data()
                 } else {
                   that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
                 }
@@ -654,7 +654,7 @@ export default {
                 
       //         if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
-      //           that.getList()
+      //           that.get_table_data()
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
       //           }
@@ -677,7 +677,7 @@ export default {
                 
       //         if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
-      //           that.getList()
+      //           that.get_table_data()
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
       //           }
@@ -690,7 +690,7 @@ export default {
     tableSort(column) {
       sortChange(column, this.listSee)
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -734,7 +734,7 @@ export default {
       }
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetCreateTemp() {
       this.createTemp.pastureId = this.$store.state.user.pastureid
@@ -926,7 +926,7 @@ export default {
           } else {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '',
               message: '保存成功',
@@ -1044,7 +1044,7 @@ export default {
           partRepId: '@insertSpotList.partRepId'
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '退回成功',
@@ -1071,7 +1071,7 @@ export default {
         this.requestParam.parammaps.id = row.id
         this.requestParam.parammaps.statue = 2
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({
             title: '成功',

src/views/custom/allot/index1.vue

@@ -70,7 +70,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="app-container">
@@ -249,7 +249,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -537,14 +537,14 @@ export default {
 
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
     tableSort(column) {
       sortChange(column, this.listSee)
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -588,7 +588,7 @@ export default {
       }
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     resetCreateTemp() {
       this.createTemp.pastureId = this.$store.state.user.pastureid
@@ -780,7 +780,7 @@ export default {
           } else {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '',
               message: '保存成功',
@@ -898,7 +898,7 @@ export default {
           partRepId: '@insertSpotList.partRepId'
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '退回成功',
@@ -925,7 +925,7 @@ export default {
         this.requestParam.parammaps.id = row.id
         this.requestParam.parammaps.statue = 2
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({
             title: '成功',

src/views/custom/basic/index.vue

@@ -132,7 +132,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
       </el-tab-pane>
       <el-tab-pane v-if="isBasicSH" label="审核备件" name="second">
         <div class="filter-container">
@@ -248,7 +248,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="totalSH>0" :total="totalSH" :page.sync="getdataListParmSH.offset" :limit.sync="getdataListParmSH.pagecount" @pagination="getListSH" />
+        <pagination v-show="totalSH>0" :total="totalSH" :page.sync="getdataListParmSH.offset" :limit.sync="getdataListParmSH.pagecount" @pagination="get_table_dataSH" />
       </el-tab-pane>
     </el-tabs>
 
@@ -380,7 +380,7 @@
       <div slot="footer" class="dialog-footer">
         <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 = '';get_table_data();">取消并关闭</el-button>
       </div>
     </el-dialog>
     <!-- 查看 -->
@@ -637,10 +637,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="getListEasStatusLst" />
+        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="get_table_dataEasStatusLst" />
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button @click="easStatus.dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button @click="easStatus.dialogFormVisible = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -915,10 +915,10 @@ export default {
     })
     this.get_select_list()
     this.getDownClassList()
-    this.getList()
+    this.get_table_data()
     this.getMaxCode()
     this.getTypeList()
-    this.getListSH()
+    this.get_table_dataSH()
 
     if (this.$route.query.tabName == undefined) {
       this.tabName = 'first'
@@ -1035,8 +1035,8 @@ export default {
               this.$notify({ title: '成功', message: '禁用成功', type: 'success', duration: 2000 })
             })
           });
-          this.getList()
-          this.getListSH()
+          this.get_table_data()
+          this.get_table_dataSH()
         }).catch(() => {
           this.$message({
             type: 'info',
@@ -1065,8 +1065,8 @@ export default {
               this.$notify({ title: '成功', message: '启用成功', type: 'success', duration: 2000 })
             })
           });
-          this.getList()
-          this.getListSH()
+          this.get_table_data()
+          this.get_table_dataSH()
         }).catch(() => {
           this.$message({
             type: 'info',
@@ -1162,7 +1162,7 @@ export default {
         }
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -1211,7 +1211,7 @@ export default {
         return '历史数据'
       }
     },
-    getListSH() {
+    get_table_dataSH() {
       this.listLoadingSH = true
       if (this.$refs['inputDatetimeSH'] !== undefined && this.$refs['inputDatetimeSH'].value !== null) {
         this.getdataListParmSH.parammaps.startTime = this.$refs['inputDatetimeSH'].value[0]
@@ -1253,7 +1253,7 @@ export default {
       }
       this.getdataListParm.parammaps.partClass = this.deptform.typeCode
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_searchSH() {
       this.listLoadingSH = true
@@ -1262,7 +1262,7 @@ export default {
       }
       this.getdataListParmSH.parammaps.partClass = this.deptform.typeCode
       this.getdataListParmSH.offset = 1
-      this.getListSH()
+      this.get_table_dataSH()
     },
     form_see(row) {
       this.activeName = 'first'
@@ -1471,7 +1471,7 @@ export default {
               this.createTemp.partCode = ''
               this.createTemp.partClass = ''
               this.createTemp.partClassNameCode = ''
-              this.getList()
+              this.get_table_data()
               this.getMaxCode()
               this.$nextTick(() => {
                 this.$refs['createTemp'].clearValidate()
@@ -1519,7 +1519,7 @@ export default {
             console.log('保存发送参数', this.postDataPramas)
             if (response.msg !== 'fail') {
               this.resetCreateTemp()
-              this.getList()
+              this.get_table_data()
               this.$nextTick(() => {
                 this.$refs['createTemp'].clearValidate()
               })
@@ -1543,8 +1543,8 @@ export default {
         this.requestParam.parammaps.id = row.id
         this.requestParam.parammaps.enable = 0
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
-          this.getListSH()
+          this.get_table_data()
+          this.get_table_dataSH()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '禁用成功', type: 'success', duration: 2000 })
         })
@@ -1558,8 +1558,8 @@ export default {
       this.requestParam.parammaps.id = row.id
       this.requestParam.parammaps.enable = 1
       PostDataByName(this.requestParam).then(() => {
-        this.getList()
-        this.getListSH()
+        this.get_table_data()
+        this.get_table_dataSH()
         this.dialogFormVisible = false
         this.$notify({ title: '成功', message: '启用成功', type: 'success', duration: 2000 })
       })
@@ -1626,8 +1626,8 @@ export default {
               this.createTemp.partCode = ''
               this.createTemp.partClass = ''
               this.createTemp.partClassNameCode = ''
-              this.getList()
-              this.getListSH()
+              this.get_table_data()
+              this.get_table_dataSH()
               this.getMaxCode()
               this.dialogFormVisible = false
               this.$nextTick(() => {
@@ -1656,8 +1656,8 @@ export default {
         this.requestParam.parammaps = {}
         this.requestParam.parammaps['id'] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
-          this.getListSH()
+          this.get_table_data()
+          this.get_table_dataSH()
           this.dialogFormVisible = false
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
         })
@@ -1816,8 +1816,8 @@ export default {
         this.isFlowChart = false
         this.isDisplayPasture = true
       }
-      this.getList()
-      this.getListSH()
+      this.get_table_data()
+      this.get_table_dataSH()
     },
     handleExamine(row) {
       if (row == undefined) {
@@ -1879,7 +1879,7 @@ export default {
             PostDataByName(this.requestParam).then(response => {
               console.log('审核确认发送参数', this.requestParam)
               if (response.msg !== 'fail') {
-                this.getListSH()
+                this.get_table_dataSH()
                 this.dialogFormVisible_Examine = false
                 this.dialogFormVisible_See = false
                 this.statueReason = false
@@ -1946,7 +1946,7 @@ export default {
           })
         } else {
           this.dialogFormVisible_Examines = false
-          this.getListSH()
+          this.get_table_dataSH()
           this.$notify({
             title: '',
             message: '保存成功',
@@ -1959,9 +1959,9 @@ export default {
     handleEAS() {
       this.easStatus.dialogStatus = 'easStatus'
       this.easStatus.dialogFormVisible = true
-      this.getListEasStatusLst()
+      this.get_table_dataEasStatusLst()
     },
-    getListEasStatusLst() {
+    get_table_dataEasStatusLst() {
       this.easStatus.listLoading = true
       GetDataByName(this.easStatus.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -1989,12 +1989,12 @@ export default {
         EasSync(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '手动同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {
@@ -2013,12 +2013,12 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '忽略同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {

src/views/custom/contract/index.vue

@@ -101,7 +101,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
       </el-tab-pane>
       <el-tab-pane label="合同明细" name="second">
         <div class="filter-container">
@@ -222,7 +222,7 @@
           </el-table-column>
           <!-- <el-table-column label="审核状态" min-width="110px" align="center" :formatter="SHStatus" /> -->
         </el-table>
-        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="getList2" />
+        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="get_table_data2" />
       </el-tab-pane>
     </el-tabs>
     <!-- 弹出层新增or 修改 -->
@@ -487,7 +487,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:5px">
           <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;get_table_data();createTemp.providerName=''">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -751,10 +751,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="totalChange>0" :total="totalChange" :page.sync="getdataListParmChange.offset" :limit.sync="getdataListParmChange.pagecount" @pagination="getListChange" />
+        <pagination v-show="totalChange>0" :total="totalChange" :page.sync="getdataListParmChange.offset" :limit.sync="getdataListParmChange.pagecount" @pagination="get_table_dataChange" />
         <div slot="footer" class="dialog-footer" style="bottom:5px">
           <el-button type="primary" :disabled="isokDisable" @click="dialogStatus==='change'?changeData():changeData()">保存并关闭</el-button>
-          <el-button @click="dialogFormVisible_change = false;getList();createTemp.providerName=''">取消并关闭</el-button>
+          <el-button @click="dialogFormVisible_change = false;get_table_data();createTemp.providerName=''">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -891,7 +891,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="totalSee>0" :total="totalSee" :page.sync="getdataListParmSee.offset" :limit.sync="getdataListParmSee.pagecount" @pagination="getListSee" />
+        <pagination v-show="totalSee>0" :total="totalSee" :page.sync="getdataListParmSee.offset" :limit.sync="getdataListParmSee.pagecount" @pagination="get_table_dataSee" />
         <el-form
           ref="seeTemp"
           :rules="rules"
@@ -1261,7 +1261,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
   methods: {
     get_auto_buttons() {
@@ -1322,7 +1322,7 @@ export default {
         this.findAllCategory = response.data.findAllCategory.list
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       console.log(this.$refs['inputDatetime'])
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
@@ -1353,17 +1353,17 @@ export default {
       }
       // this.getdataListParm.parammaps.providerName = this.createTemp.providerName
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleClick(tab, event) {
       console.log(tab, event)
       if (tab.name === 'second') {
-        this.getList2()
+        this.get_table_data2()
       } else {
-        this.getList()
+        this.get_table_data()
       }
     },
-    getList2() {
+    get_table_data2() {
       this.listLoading2 = true
       if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
         this.getdataListParm2.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
@@ -1390,7 +1390,7 @@ export default {
         this.getdataListParm2.parammaps.inputDatetime = ''
       }
       this.getdataListParm2.offset = 1
-      this.getList2()
+      this.get_table_data2()
     },
     changeAll() {
       console.log(this.radioAll)
@@ -1405,7 +1405,7 @@ export default {
           providerName: '',
           inputDatetime: ''
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '待处理') {
         this.getdataListParm.name = 'providerPactWebListNO'
         this.getdataListParm.offset = 1
@@ -1420,7 +1420,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '已处理') {
         this.getdataListParm.name = 'providerPactWebList'
         this.getdataListParm.offset = 1
@@ -1435,7 +1435,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       }
     },
     SHStatus: function(cellValue) {
@@ -1475,7 +1475,7 @@ export default {
       console.log('查看上方数据(从table读取)', this.seeTemp.isZeroStock)
       // 基础信息
       this.getdataListParmSee.parammaps.id = row.id
-      this.getListSee()
+      this.get_table_dataSee()
       // 流程图
       var reason = '未通过原因:' + this.seeTemp.workflowNote
       if (this.seeTemp.SHStatus == 2) {
@@ -1501,7 +1501,7 @@ export default {
         this.active = 4
       }
     },
-    getListSee() {
+    get_table_dataSee() {
       GetDataByName(this.getdataListParmSee).then(response => {
         this.listSee = response.data.list
         this.pageNumSee = response.data.pageNum
@@ -1767,7 +1767,7 @@ export default {
             })
           } else {
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.createTemp.providerName = ''
             this.$notify({
@@ -1844,7 +1844,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
               this.isStatueReason = false
@@ -1900,7 +1900,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
               this.isStatueReason = false
@@ -1963,7 +1963,7 @@ export default {
                   duration: 2000
                 })
               } else {
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_Examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -1988,7 +1988,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_Examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2006,7 +2006,7 @@ export default {
         }
       })
     },
-    getListChange() {
+    get_table_dataChange() {
       GetDataByName(this.getdataListParmChange).then(response => {
         this.$nextTick(() => {
           this.listAdd = response.data.list
@@ -2053,7 +2053,7 @@ export default {
               this.isDisabled2 = true
               this.getCreateNumber()
               this.getdataListParmChange.parammaps.id = response.data.list[0].msg
-              this.getListChange()
+              this.get_table_dataChange()
             })
           } else {
             this.$message({
@@ -2105,7 +2105,7 @@ export default {
           PostDataByName(this.postDataPramas).then(response => {
             console.log('保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getListChange()
+              this.get_table_dataChange()
               this.$notify({
                 title: '成功',
                 message: '保存成功',
@@ -2136,7 +2136,7 @@ export default {
           PostDataByName(this.postDataPramas).then(response => {
             console.log('保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getListChange()
+              this.get_table_dataChange()
               this.$notify({
                 title: '成功',
                 message: '保存成功',
@@ -2178,7 +2178,7 @@ export default {
           this.postDataPramas.parammaps = {}
           this.postDataPramas.parammaps['id'] = row.id
           PostDataByName(this.postDataPramas).then(() => {
-            this.getListChange()
+            this.get_table_dataChange()
             this.$notify({
               title: '成功',
               message: '删除成功',
@@ -2210,7 +2210,7 @@ export default {
               console.log('变更保存发送参数', this.requestParam)
               if (response.msg !== 'fail') {
                 this.dialogFormVisible_change = false
-                this.getList()
+                this.get_table_data()
                 this.$notify({
                   title: '成功',
                   message: '变更成功',
@@ -2306,7 +2306,7 @@ export default {
         //             })
         //           } else {
         //             this.getdataListParm.parammaps.inputDatetime = ''
-        //             this.getList()
+        //             this.get_table_data()
         //             this.dialogFormVisible_change = false
         //             this.createTemp.providerName = ''
         //             this.$notify({
@@ -2344,7 +2344,7 @@ export default {
               console.log('变更保存发送参数', this.requestParam)
               if (response.msg !== 'fail') {
                 this.dialogFormVisible_change = false
-                this.getList()
+                this.get_table_data()
                 this.$notify({
                   title: '成功',
                   message: '变更成功',
@@ -2442,7 +2442,7 @@ export default {
         //           })
         //         } else {
         //           this.getdataListParm.parammaps.inputDatetime = ''
-        //           this.getList()
+        //           this.get_table_data()
         //           this.dialogFormVisible_change = false
         //           this.createTemp.providerName = ''
         //           this.$notify({
@@ -2548,7 +2548,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess(res, file) {
-      this.getList()
+      this.get_table_data()
       if (res.msg === 'ok') {
         this.$message({
           title: '成功',
@@ -2679,7 +2679,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -2701,9 +2701,9 @@ export default {
       this.dialogFormVisible = true
       this.getdataListParmSee.parammaps.pastureId = row.pastureId
       this.getdataListParmSee.parammaps.contractNO = row.contractNO
-      this.getListCard()
+      this.get_table_dataCard()
     },
-    getListCard() {
+    get_table_dataCard() {
       GetDataByName(this.getdataListParmSee).then(response => {
         // this.list2 = response.data.list
         console.log(this.list2)
@@ -2736,7 +2736,7 @@ export default {
           bigId: row.id
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '删除成功',

src/views/custom/contractManagement/index.vue

@@ -223,6 +223,9 @@
           <el-select v-model="tab2.getdataListParm.parammaps.statue" clearable placeholder="合同状态" class="filter-item" style="width: 120px;">
             <el-option v-for="item in contractStatusList" :key="item.id" :label="item.name" :value="item.name" />
           </el-select>
+          <el-select v-model="tab2.getdataListParm.parammaps.isZeroStock" clearable placeholder="是否零库存" class="filter-item" style="width: 120px;">
+              <el-option v-for="item in isZeroInventoryList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
           <el-input v-model="tab2.getdataListParm.parammaps.partCode" placeholder="备件编号" style="width: 140px;" class="filter-item" />
           <el-input v-model="tab2.getdataListParm.parammaps.partName" placeholder="备件名称" style="width: 140px;" class="filter-item" />
           <el-select v-model="tab2.getdataListParm.parammaps.providerName" filterable clearable style="width: 140px;" placeholder="供应商" class="filter-item">
@@ -1259,6 +1262,7 @@ export default {
             statue: '',
             partCode: '',
             partName: '',
+            isZeroStock: '',
             // pastureName: Cookies.get('pasturename')
             pastureName: ''
           }

src/views/custom/custom/index.vue

@@ -155,7 +155,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 卡片 -->
     <el-dialog :title="textMap[dialogStatusCard]" :visible.sync="dialogFormVisibleCard" :close-on-click-modal="false" style="width:100%;">
       <div class="app-contentcard" style="width:90%;margin:0 auto">
@@ -484,7 +484,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" :disabled="isokDisable" @click="changeData()">保存并关闭</el-button>
-          <el-button @click="dialogFormVisible_change = false;getList();">取消并关闭</el-button>
+          <el-button @click="dialogFormVisible_change = false;get_table_data();">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -824,7 +824,7 @@ export default {
     this.getTypeList()
     this.get_select_list()
     this.getDownClassList()
-    this.getList()
+    this.get_table_data()
 
     // this.getDownLoadList()
     const that = this
@@ -891,7 +891,7 @@ export default {
         this.findAllCategory = response.data.findAllCategory.list
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       console.log(this.$route.query.providerName)
       if (this.$route.query.pastureName !== undefined) {
@@ -1026,7 +1026,7 @@ export default {
           PostDataByName(this.changeParam).then(response => {
             console.log(response)
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_change = false
               this.$notify({
                 title: '成功',
@@ -1067,7 +1067,7 @@ export default {
       this.listLoading = true
       this.getdataListParm.offset = 1
       this.getdataListParm.pastureName = Cookies.get('pasturename')
-      this.getList()
+      this.get_table_data()
     },
     form_searchClear() {
       this.listLoading = true

src/views/custom/inventory/index.vue

@@ -103,7 +103,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <!-- 弹出层新增or查看 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
@@ -673,7 +673,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getTypeList()
   },
 
@@ -791,7 +791,7 @@ export default {
       this.temp3.providerName = item.name
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
         this.getdataListParm.parammaps.stopTime = this.$refs['inputDatetime'].value[1]
@@ -834,7 +834,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -881,7 +881,7 @@ export default {
             duration: 2000
           })
         } else {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.createTemp.providerName = ''
           this.$notify({
@@ -1053,7 +1053,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible3 = false
               this.$notify({
                 title: '成功',
@@ -1104,7 +1104,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
 
               this.$notify({

src/views/custom/outRecord/index.vue

@@ -243,7 +243,7 @@
       :total="totalImportInfo"
       :page.sync="getdataListParmImportInfo.offset"
       :limit.sync="getdataListParmImportInfo.pagecount"
-      @pagination="getListImportInfo"
+      @pagination="get_table_dataImportInfo"
     />
     <el-dialog
       :title="textMap[dialogStatusErro]"
@@ -434,7 +434,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getListImportInfo()
+    this.get_table_dataImportInfo()
   },
 
   methods: {
@@ -451,7 +451,7 @@ export default {
       this.temp.providerName = item.name
     },
     // 1-1: 导入信息table&搜索
-    getListImportInfo() {
+    get_table_dataImportInfo() {
       this.listLoadingImportInfo = true
       if (this.getdataListParmImportInfo.parammaps.receiveTime === null) {
         this.getdataListParmImportInfo.parammaps.receiveTime = ''
@@ -473,7 +473,7 @@ export default {
     form_search() {
       this.listLoadingImportInfo = true
       this.getdataListParmImportInfo.offset = 1
-      this.getListImportInfo()
+      this.get_table_dataImportInfo()
     },
     // 2-2：下拉框
     get_select_list() {
@@ -653,7 +653,7 @@ export default {
     handleImportInfo() {
       this.dialogStatusImportInfo = 'ImportInfo'
       this.dialogFormVisibleImportInfo = true
-      this.getListImportInfo()
+      this.get_table_dataImportInfo()
     },
     // 选择要删除的数据
     handleSelectionChange(val) {
@@ -704,7 +704,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getListImportInfo()
+              this.get_table_dataImportInfo()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',

src/views/custom/outStock/index.vue

@@ -132,7 +132,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
       </el-tab-pane>
       <el-tab-pane label="出库记录" name="second">
         <div class="filter-container">
@@ -289,7 +289,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="getList2" />
+        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="get_table_data2" />
       </el-tab-pane>
     </el-tabs>
     <!-- 弹出层新增or修改 -->
@@ -710,7 +710,7 @@
         />
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -980,10 +980,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="getListEasStatusLst" />
+        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="get_table_dataEasStatusLst" />
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button @click="easStatus.dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button @click="easStatus.dialogFormVisible = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -1356,7 +1356,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getTypeList()
   },
 
@@ -1418,7 +1418,7 @@ export default {
               if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
-                that.getList()
+                that.get_table_data()
                 
                 } else {
                   that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -1459,7 +1459,7 @@ export default {
                 
       //         if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
-      //           that.getList()
+      //           that.get_table_data()
                 
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -1604,7 +1604,7 @@ export default {
     changeDepart(item) {
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       console.log(this.$refs['inputDatetime'])
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
@@ -1631,12 +1631,12 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event)
       if (tab.name === 'second') {
-        this.getList2()
+        this.get_table_data2()
       } else {
-        this.getList()
+        this.get_table_data()
       }
     },
-    getList2() {
+    get_table_data2() {
       this.listLoading2 = true
       if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
         this.getdataListParm2.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
@@ -1664,7 +1664,7 @@ export default {
         this.getdataListParm2.parammaps.inputDatetime = ''
       }
       this.getdataListParm2.offset = 1
-      this.getList2()
+      this.get_table_data2()
     },
     useType: function(cellValue) {
       // console.log(cellValue.isZeroStock)
@@ -1690,7 +1690,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_see(row) {
       this.seeTemp = Object.assign({}, row)
@@ -1876,9 +1876,9 @@ export default {
       this.createTemp.applicatId = item.empId
       this.orderPart.applyCode = item.applyCode
       this.TotalAmount = 0
-      this.getListAdd()
+      this.get_table_dataAdd()
     },
-    getListAdd() {
+    get_table_dataAdd() {
       GetDataByName(this.getParmCreateAdd).then(response => {
         console.log('领用单号list列表', response.data.list)
         this.createTemp.applyType = response.data.list[0].applyType
@@ -2267,7 +2267,7 @@ export default {
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
               setTimeout(() => {
-                this.getList()
+                this.get_table_data()
               }, 1000)
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               this.dialogFormVisible = false
@@ -2371,7 +2371,7 @@ export default {
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
               setTimeout(() => {
-                this.getList()
+                this.get_table_data()
               }, 1000)
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               this.dialogFormVisible = false
@@ -2449,7 +2449,7 @@ export default {
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
               setTimeout(() => {
-                this.getList()
+                this.get_table_data()
               }, 1000)
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               this.dialogFormVisible = false
@@ -2548,7 +2548,7 @@ export default {
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
               setTimeout(() => {
-                this.getList()
+                this.get_table_data()
               }, 1000)
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               this.dialogFormVisible = false
@@ -2902,7 +2902,7 @@ export default {
           id: row.id
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '删除成功',
@@ -2949,9 +2949,9 @@ export default {
     handleEAS() {
       this.easStatus.dialogStatus = 'easStatus'
       this.easStatus.dialogFormVisible = true
-      this.getListEasStatusLst()
+      this.get_table_dataEasStatusLst()
     },
-    getListEasStatusLst() {
+    get_table_dataEasStatusLst() {
       this.easStatus.listLoading = true
       GetDataByName(this.easStatus.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -2981,12 +2981,12 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '关闭同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {
@@ -3003,12 +3003,12 @@ export default {
         EasSync(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '手动同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {
@@ -3027,12 +3027,12 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '忽略同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {

src/views/custom/outStock/index1.vue

@@ -106,7 +106,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
       </el-tab-pane>
       <el-tab-pane label="出库记录" name="second">
         <div class="filter-container">
@@ -263,7 +263,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="getList2" />
+        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="get_table_data2" />
       </el-tab-pane>
     </el-tabs>
     <!-- 弹出层新增or修改 -->
@@ -684,7 +684,7 @@
         />
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -954,10 +954,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="getListEasStatusLst" />
+        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="get_table_dataEasStatusLst" />
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button @click="easStatus.dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button @click="easStatus.dialogFormVisible = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -1299,7 +1299,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getTypeList()
   },
 
@@ -1442,7 +1442,7 @@ export default {
     changeDepart(item) {
       this.createTemp.departmentName = this.createDepartList.find(obj => obj.id == item).name
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       console.log(this.$refs['inputDatetime'])
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
@@ -1469,12 +1469,12 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event)
       if (tab.name === 'second') {
-        this.getList2()
+        this.get_table_data2()
       } else {
-        this.getList()
+        this.get_table_data()
       }
     },
-    getList2() {
+    get_table_data2() {
       this.listLoading2 = true
       if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
         this.getdataListParm2.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
@@ -1502,7 +1502,7 @@ export default {
         this.getdataListParm2.parammaps.inputDatetime = ''
       }
       this.getdataListParm2.offset = 1
-      this.getList2()
+      this.get_table_data2()
     },
     useType: function(cellValue) {
       // console.log(cellValue.isZeroStock)
@@ -1528,7 +1528,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_see(row) {
       this.seeTemp = Object.assign({}, row)
@@ -1710,9 +1710,9 @@ export default {
       this.createTemp.applicatId = item.empId
       this.orderPart.applyCode = item.applyCode
       this.TotalAmount = 0
-      this.getListAdd()
+      this.get_table_dataAdd()
     },
-    getListAdd() {
+    get_table_dataAdd() {
       GetDataByName(this.getParmCreateAdd).then(response => {
         console.log('领用单号list列表', response.data.list)
         this.createTemp.applyType = response.data.list[0].applyType
@@ -2101,7 +2101,7 @@ export default {
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
               setTimeout(() => {
-                this.getList()
+                this.get_table_data()
               }, 1000)
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               this.dialogFormVisible = false
@@ -2205,7 +2205,7 @@ export default {
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
               setTimeout(() => {
-                this.getList()
+                this.get_table_data()
               }, 1000)
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               this.dialogFormVisible = false
@@ -2283,7 +2283,7 @@ export default {
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
               setTimeout(() => {
-                this.getList()
+                this.get_table_data()
               }, 1000)
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               this.dialogFormVisible = false
@@ -2382,7 +2382,7 @@ export default {
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
               setTimeout(() => {
-                this.getList()
+                this.get_table_data()
               }, 1000)
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               this.dialogFormVisible = false
@@ -2735,7 +2735,7 @@ export default {
           id: row.id
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '删除成功',
@@ -2782,9 +2782,9 @@ export default {
     handleEAS() {
       this.easStatus.dialogStatus = 'easStatus'
       this.easStatus.dialogFormVisible = true
-      this.getListEasStatusLst()
+      this.get_table_dataEasStatusLst()
     },
-    getListEasStatusLst() {
+    get_table_dataEasStatusLst() {
       this.easStatus.listLoading = true
       GetDataByName(this.easStatus.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -2814,12 +2814,12 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '关闭同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {
@@ -2836,12 +2836,12 @@ export default {
         EasSync(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '手动同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {
@@ -2860,12 +2860,12 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '忽略同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {

src/views/custom/purchase/index.vue

@@ -224,7 +224,7 @@
               </div>
               <div slot="footer" class="dialog-footer" style="bottom:10px">
                 <el-button type="primary" :disabled="isokDisable" @click="confirmationSheetData()">确认</el-button>
-                <el-button @click="dialogFormVisibleConfirmation= false;getList1();">取消</el-button>
+                <el-button @click="dialogFormVisibleConfirmation= false;get_table_data1();">取消</el-button>
               </div>
             </div>
           </el-dialog>
@@ -301,7 +301,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="total4>0" :total="total4" :page.sync="getdataListParm4.offset" :limit.sync="getdataListParm4.pagecount" @pagination="getList4" />
+          <pagination v-show="total4>0" :total="total4" :page.sync="getdataListParm4.offset" :limit.sync="getdataListParm4.pagecount" @pagination="get_table_data4" />
           <el-dialog :title="textMap[dialogStatusSee4]" :visible.sync="dialogFormVisibleSee4" :close-on-click-modal="false">
             <div class="app-contentSee">
               <el-form ref="temp4" :rules="rules" :model="temp4" label-position="right" label-width="80px" style="width: 800px;margin-bottom:30px">
@@ -678,7 +678,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="getList2" />
+          <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="get_table_data2" />
           <el-dialog :title="textMap[dialogStatusSee2]" :visible.sync="dialogFormVisibleSee2" :close-on-click-modal="false">
             <div class="app-contentSee">
               <el-form
@@ -804,7 +804,7 @@
                 class="dialog-footer"
                 style="right:30px;position:absolute;bottom:10px"
               >
-                <el-button @click="dialogFormVisibleSee2 = false;getList2()">关闭</el-button>
+                <el-button @click="dialogFormVisibleSee2 = false;get_table_data2()">关闭</el-button>
               </div>
             </div>
           </el-dialog>
@@ -838,7 +838,7 @@
                 class="dialog-footer"
                 style="right:30px;position:absolute;bottom:10px"
               >
-                <el-button @click="dialogFormVisibleClose = false;getList2();">取消</el-button>
+                <el-button @click="dialogFormVisibleClose = false;get_table_data2();">取消</el-button>
                 <el-button type="primary" :disabled="isokDisable" @click="closeData()">确认关闭</el-button>
               </div>
             </div>
@@ -964,7 +964,7 @@
               </template>
             </el-table-column> -->
           </el-table>
-          <pagination v-show="total3>=0" :total="total3" :page.sync="getdataListParm3.offset" :limit.sync="getdataListParm3.pagecount" @pagination="getList3" />
+          <pagination v-show="total3>=0" :total="total3" :page.sync="getdataListParm3.offset" :limit.sync="getdataListParm3.pagecount" @pagination="get_table_data3" />
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -1265,10 +1265,10 @@ export default {
       }
     })
     this.get_select_list()
-    this.getList1()
-    this.getList2()
-    this.getList3()
-    this.getList4()
+    this.get_table_data1()
+    this.get_table_data2()
+    this.get_table_data3()
+    this.get_table_data4()
     if (this.$route.query.activeName !== undefined) {
       this.activeName = this.$route.query.activeName
     }
@@ -1280,7 +1280,7 @@ export default {
       console.log(e)
       this.getdataListParm1.parammaps.departmentId = e
       this.getdataListPart.parammaps.departmentId = e
-      this.getList1()
+      this.get_table_data1()
     },
     tableSort(column) {
       if (this.activeName == 'first') {
@@ -1365,13 +1365,13 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event)
       if (tab.name === 'first') {
-        this.getList1()
+        this.get_table_data1()
       } else if (tab.name === 'fouth') {
-        this.getList4()
+        this.get_table_data4()
       } else if (tab.name === 'second') {
-        this.getList2()
+        this.get_table_data2()
       } else if (tab.name === 'third') {
-        this.getList3()
+        this.get_table_data3()
       }
     },
     get_select_list() {
@@ -1393,7 +1393,7 @@ export default {
     handleSelectProvider(item) {
       console.log('供应商模糊查询选中值', item)
     },
-    getList1() {
+    get_table_data1() {
       this.listLoading1 = true
       GetDataByName(this.getdataListPart).then(response => {
         console.log(response)
@@ -1794,7 +1794,7 @@ export default {
             } else {
               this.dialogFormVisibleConfirmation = false
               this.activeName = 'fouth'
-              this.getList4()
+              this.get_table_data4()
               this.$notify({
                 title: '',
                 message: '保存成功',
@@ -1807,7 +1807,7 @@ export default {
       })
     },
 
-    getList2() {
+    get_table_data2() {
       this.listLoading2 = true
       if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
         this.getdataListParm2.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
@@ -1835,7 +1835,7 @@ export default {
         this.getdataListParm2.parammaps.inputDatetime = ''
       }
       this.getdataListParm2.offset = 1
-      this.getList2()
+      this.get_table_data2()
     },
     statu: function(cellValue) {
       if (cellValue.statu === 0) {
@@ -1975,7 +1975,7 @@ export default {
                if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
-                that.getList2()
+                that.get_table_data2()
                  
                 } else {
                   that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -2017,7 +2017,7 @@ export default {
                 
       //          if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
-      //           that.getList()
+      //           that.get_table_data()
                  
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -2075,7 +2075,7 @@ export default {
                if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
-                that.getList2()
+                that.get_table_data2()
                 
                  
                 } else {
@@ -2115,7 +2115,7 @@ export default {
                 
       //          if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
-      //           that.getList()
+      //           that.get_table_data()
                  
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -2148,7 +2148,7 @@ export default {
           PostDataByName(this.requestParamStute).then(response => {
             console.log('新增保存发送参数', this.requestParamStute)
             if (response.msg !== 'fail') {
-              this.getList2()
+              this.get_table_data2()
               this.dialogFormVisibleClose = false
               this.$notify({
                 title: '成功',
@@ -2163,7 +2163,7 @@ export default {
         }
       })
     },
-    getList3() {
+    get_table_data3() {
       this.listLoading3 = true
       if (this.$refs['inputDatetime3'] !== undefined && this.$refs['inputDatetime3'].value !== null) {
         this.getdataListParm3.parammaps.startTime = this.$refs['inputDatetime3'].value[0]
@@ -2191,7 +2191,7 @@ export default {
         this.getdataListParm3.parammaps.inputDatetime = ''
       }
       this.getdataListParm3.offset = 1
-      this.getList3()
+      this.get_table_data3()
     },
     handleDownload3() {
       console.log('点击了采购明细导出')
@@ -2227,7 +2227,7 @@ export default {
         json2excel(elecExcelDatas, '采购明细', true, 'xlsx')
       })
     },
-    getList4() {
+    get_table_data4() {
       this.listLoading4 = true
       if (this.$refs['inputDatetime4'] !== undefined && this.$refs['inputDatetime4'].value !== null) {
         this.getdataListParm4.parammaps.startTime = this.$refs['inputDatetime4'].value[0]
@@ -2255,7 +2255,7 @@ export default {
         this.getdataListParm4.parammaps.inputDatetime = ''
       }
       this.getdataListParm4.offset = 1
-      this.getList4()
+      this.get_table_data4()
     },
     form_see4(row) {
       this.dialogStatusSee4 = 'see'
@@ -2359,7 +2359,7 @@ export default {
                 })
               } else {
                 this.dialogFormVisible_Examine = false
-                this.getList4()
+                this.get_table_data4()
                 this.$notify({
                   title: '',
                   message: '审核成功',
@@ -2393,7 +2393,7 @@ export default {
                 })
               } else {
                 this.dialogFormVisible_Examine = false
-                this.getList4()
+                this.get_table_data4()
                 this.$notify({
                   title: '',
                   message: '审核成功',
@@ -2479,7 +2479,7 @@ export default {
             } else {
               this.dialogFormVisibleUpdate4 = false
               this.getdataListParm4.parammaps.inputDatetime = ''
-              this.getList4()
+              this.get_table_data4()
               this.$notify({
                 title: '',
                 message: '保存成功',

src/views/custom/purchase/index1.vue

@@ -216,7 +216,7 @@
               </div>
               <div slot="footer" class="dialog-footer" style="bottom:10px">
                 <el-button type="primary" :disabled="isokDisable" @click="confirmationSheetData()">确认</el-button>
-                <el-button @click="dialogFormVisibleConfirmation= false;getList1();">取消</el-button>
+                <el-button @click="dialogFormVisibleConfirmation= false;get_table_data1();">取消</el-button>
               </div>
             </div>
           </el-dialog>
@@ -293,7 +293,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="total4>0" :total="total4" :page.sync="getdataListParm4.offset" :limit.sync="getdataListParm4.pagecount" @pagination="getList4" />
+          <pagination v-show="total4>0" :total="total4" :page.sync="getdataListParm4.offset" :limit.sync="getdataListParm4.pagecount" @pagination="get_table_data4" />
           <el-dialog :title="textMap[dialogStatusSee4]" :visible.sync="dialogFormVisibleSee4" :close-on-click-modal="false">
             <div class="app-contentSee">
               <el-form ref="temp4" :rules="rules" :model="temp4" label-position="right" label-width="80px" style="width: 800px;margin-bottom:30px">
@@ -670,7 +670,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="getList2" />
+          <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="get_table_data2" />
           <el-dialog :title="textMap[dialogStatusSee2]" :visible.sync="dialogFormVisibleSee2" :close-on-click-modal="false">
             <div class="app-contentSee">
               <el-form
@@ -796,7 +796,7 @@
                 class="dialog-footer"
                 style="right:30px;position:absolute;bottom:10px"
               >
-                <el-button @click="dialogFormVisibleSee2 = false;getList2()">关闭</el-button>
+                <el-button @click="dialogFormVisibleSee2 = false;get_table_data2()">关闭</el-button>
               </div>
             </div>
           </el-dialog>
@@ -830,7 +830,7 @@
                 class="dialog-footer"
                 style="right:30px;position:absolute;bottom:10px"
               >
-                <el-button @click="dialogFormVisibleClose = false;getList2();">取消</el-button>
+                <el-button @click="dialogFormVisibleClose = false;get_table_data2();">取消</el-button>
                 <el-button type="primary" :disabled="isokDisable" @click="closeData()">确认关闭</el-button>
               </div>
             </div>
@@ -956,7 +956,7 @@
               </template>
             </el-table-column> -->
           </el-table>
-          <pagination v-show="total3>=0" :total="total3" :page.sync="getdataListParm3.offset" :limit.sync="getdataListParm3.pagecount" @pagination="getList3" />
+          <pagination v-show="total3>=0" :total="total3" :page.sync="getdataListParm3.offset" :limit.sync="getdataListParm3.pagecount" @pagination="get_table_data3" />
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -1251,10 +1251,10 @@ export default {
     //   }
     // })
     // this.get_select_list()
-    // this.getList1()
-    // this.getList2()
-    // this.getList3()
-    // this.getList4()
+    // this.get_table_data1()
+    // this.get_table_data2()
+    // this.get_table_data3()
+    // this.get_table_data4()
     // if (this.$route.query.activeName !== undefined) {
     //   this.activeName = this.$route.query.activeName
     // }
@@ -1350,13 +1350,13 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event)
       if (tab.name === 'first') {
-        this.getList1()
+        this.get_table_data1()
       } else if (tab.name === 'fouth') {
-        this.getList4()
+        this.get_table_data4()
       } else if (tab.name === 'second') {
-        this.getList2()
+        this.get_table_data2()
       } else if (tab.name === 'third') {
-        this.getList3()
+        this.get_table_data3()
       }
     },
     get_select_list() {
@@ -1376,7 +1376,7 @@ export default {
     handleSelectProvider(item) {
       console.log('供应商模糊查询选中值', item)
     },
-    getList1() {
+    get_table_data1() {
       this.listLoading1 = true
       GetDataByName(this.getdataListPart).then(response => {
         console.log(response)
@@ -1788,7 +1788,7 @@ export default {
             } else {
               this.dialogFormVisibleConfirmation = false
               this.activeName = 'fouth'
-              this.getList4()
+              this.get_table_data4()
               this.$notify({
                 title: '',
                 message: '保存成功',
@@ -1801,7 +1801,7 @@ export default {
       })
     },
 
-    getList2() {
+    get_table_data2() {
       this.listLoading2 = true
       if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
         this.getdataListParm2.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
@@ -1829,7 +1829,7 @@ export default {
         this.getdataListParm2.parammaps.inputDatetime = ''
       }
       this.getdataListParm2.offset = 1
-      this.getList2()
+      this.get_table_data2()
     },
     statu: function(cellValue) {
       if (cellValue.statu === 0) {
@@ -1969,7 +1969,7 @@ export default {
                if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
-                that.getList2()
+                that.get_table_data2()
                  
                 } else {
                   that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -2011,7 +2011,7 @@ export default {
                 
       //          if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
-      //           that.getList()
+      //           that.get_table_data()
                  
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -2069,7 +2069,7 @@ export default {
                if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
-                that.getList2()
+                that.get_table_data2()
                 
                  
                 } else {
@@ -2109,7 +2109,7 @@ export default {
                 
       //          if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
-      //           that.getList()
+      //           that.get_table_data()
                  
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -2142,7 +2142,7 @@ export default {
           PostDataByName(this.requestParamStute).then(response => {
             console.log('新增保存发送参数', this.requestParamStute)
             if (response.msg !== 'fail') {
-              this.getList2()
+              this.get_table_data2()
               this.dialogFormVisibleClose = false
               this.$notify({
                 title: '成功',
@@ -2157,7 +2157,7 @@ export default {
         }
       })
     },
-    getList3() {
+    get_table_data3() {
       this.listLoading3 = true
       if (this.$refs['inputDatetime3'] !== undefined && this.$refs['inputDatetime3'].value !== null) {
         this.getdataListParm3.parammaps.startTime = this.$refs['inputDatetime3'].value[0]
@@ -2185,7 +2185,7 @@ export default {
         this.getdataListParm3.parammaps.inputDatetime = ''
       }
       this.getdataListParm3.offset = 1
-      this.getList3()
+      this.get_table_data3()
     },
     handleDownload3() {
       console.log('点击了采购明细导出')
@@ -2221,7 +2221,7 @@ export default {
         json2excel(elecExcelDatas, '采购明细', true, 'xlsx')
       })
     },
-    getList4() {
+    get_table_data4() {
       this.listLoading4 = true
       if (this.$refs['inputDatetime4'] !== undefined && this.$refs['inputDatetime4'].value !== null) {
         this.getdataListParm4.parammaps.startTime = this.$refs['inputDatetime4'].value[0]
@@ -2249,7 +2249,7 @@ export default {
         this.getdataListParm4.parammaps.inputDatetime = ''
       }
       this.getdataListParm4.offset = 1
-      this.getList4()
+      this.get_table_data4()
     },
     form_see4(row) {
       this.dialogStatusSee4 = 'see'
@@ -2353,7 +2353,7 @@ export default {
                 })
               } else {
                 this.dialogFormVisible_Examine = false
-                this.getList4()
+                this.get_table_data4()
                 this.$notify({
                   title: '',
                   message: '审核成功',
@@ -2387,7 +2387,7 @@ export default {
                 })
               } else {
                 this.dialogFormVisible_Examine = false
-                this.getList4()
+                this.get_table_data4()
                 this.$notify({
                   title: '',
                   message: '审核成功',
@@ -2473,7 +2473,7 @@ export default {
             } else {
               this.dialogFormVisibleUpdate4 = false
               this.getdataListParm4.parammaps.inputDatetime = ''
-              this.getList4()
+              this.get_table_data4()
               this.$notify({
                 title: '',
                 message: '保存成功',

src/views/custom/receive/index.vue

@@ -90,7 +90,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 新增 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="app-add">
@@ -282,7 +282,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -674,7 +674,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getPendingList()
   },
 
@@ -758,7 +758,7 @@ export default {
         this.pending.total = response.data.total3
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -795,7 +795,7 @@ export default {
           logindeptId: Cookies.get('departmentid'),
           loginpastureId: Cookies.get('pastureid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '待处理') {
         this.getdataListParm.name = 'getPartapplyWebListNO'
         this.getdataListParm.offset = 1
@@ -816,7 +816,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '已处理') {
         this.getdataListParm.name = 'getPartapplyWebList'
         this.getdataListParm.offset = 1
@@ -837,7 +837,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       }
     },
     applyType: function(cellValue) {
@@ -884,7 +884,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
       this.getPendingList()
     },
     changeStatue(val) {
@@ -1282,7 +1282,7 @@ export default {
           } else {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.getPendingList()
             this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
           }
@@ -1366,7 +1366,7 @@ export default {
           bigId: row.id
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.getPendingList()
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
         })
@@ -1453,7 +1453,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
               this.isStatueReason = false
@@ -1509,7 +1509,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
@@ -1565,7 +1565,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
@@ -1617,7 +1617,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
@@ -1714,7 +1714,7 @@ export default {
           } else {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.getPendingList()
             this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
           }
@@ -1742,7 +1742,7 @@ export default {
           } else {
             this.getPendingList()
             this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-            this.getList()
+            this.get_table_data()
           }
         })
       }).catch(() => {

src/views/custom/record/index.vue

@@ -186,7 +186,7 @@
       :total="totalImportInfo"
       :page.sync="getdataListParmImportInfo.offset"
       :limit.sync="getdataListParmImportInfo.pagecount"
-      @pagination="getListImportInfo"
+      @pagination="get_table_dataImportInfo"
     />
     <el-dialog
       :title="textMap[dialogStatusErro]"
@@ -395,7 +395,7 @@ export default {
 
   created() {
     this.get_select_list()
-    this.getListImportInfo()
+    this.get_table_dataImportInfo()
   },
 
   methods: {
@@ -511,7 +511,7 @@ export default {
       }
     },
     // 1-1: 导入信息table&搜索
-    getListImportInfo() {
+    get_table_dataImportInfo() {
       this.listLoadingImportInfo = true
       if (this.getdataListParmImportInfo.parammaps.storageTime === null) {
         this.getdataListParmImportInfo.parammaps.storageTime = ''
@@ -532,7 +532,7 @@ export default {
     },
     form_searchImportInfo() {
       this.listLoadingImportInfo = true
-      this.getListImportInfo()
+      this.get_table_dataImportInfo()
     },
     // 2-2：下拉框
     get_select_list() {
@@ -548,8 +548,8 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParmImportInfo.offset = 1
-      this.getListImportInfo()
-      // this.getList()
+      this.get_table_dataImportInfo()
+      // this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -612,7 +612,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getListImportInfo()
+              this.get_table_dataImportInfo()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',

src/views/custom/refuse/index.vue

@@ -107,7 +107,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层销毁/卖掉 -->
     <el-dialog title="旧品处理" :visible.sync="dialogFormVisibleDestruction" :close-on-click-modal="false" width="30%">
       <el-form ref="temp" :model="temp" label-position="right" label-width="100px" style="width: 400px;" :rules="rules">
@@ -398,7 +398,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -439,7 +439,7 @@ export default {
       console.log(item)
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -475,7 +475,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -533,7 +533,7 @@ export default {
                 if (response.msg === 'fail') {
                   this.$notify({ title: '失败', message: '保存失败-' + response.data, type: 'warning', duration: 2000 })
                 } else {
-                  this.getList()
+                  this.get_table_data()
                   this.dialogFormVisibleDestruction = false
                   this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
                 }
@@ -559,7 +559,7 @@ export default {
                   if (response.msg === 'fail') {
                     this.$notify({ title: '失败', message: '保存失败-' + response.data, type: 'warning', duration: 2000 })
                   } else {
-                    this.getList()
+                    this.get_table_data()
                     this.dialogFormVisibleDestruction = false
                     this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
                   }
@@ -585,7 +585,7 @@ export default {
                   if (response.msg === 'fail') {
                     this.$notify({ title: '失败', message: '保存失败-' + response.data, type: 'warning', duration: 2000 })
                   } else {
-                    this.getList()
+                    this.get_table_data()
                     this.dialogFormVisibleDestruction = false
                     this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
                   }

src/views/custom/retreat/index.vue

@@ -90,7 +90,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
       </el-tab-pane>
       <el-tab-pane label="退库记录" name="second">
         <div class="filter-container">
@@ -209,7 +209,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="getList2" />
+        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="get_table_data2" />
       </el-tab-pane>
     </el-tabs>
     <!-- 弹出层新增or修改 -->
@@ -410,7 +410,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -579,10 +579,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="getListEasStatusLst" />
+        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="get_table_dataEasStatusLst" />
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button @click="easStatus.dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button @click="easStatus.dialogFormVisible = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -803,7 +803,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -849,7 +849,7 @@ export default {
       const isIgnoreSynchronization = checkButtons(this.$store.state.user.buttons, IgnoreSynchronization)
       this.isIgnoreSynchronization = isIgnoreSynchronization
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -889,17 +889,17 @@ export default {
       }
       this.getdataListParm.offset = 1
       this.listLoading = true
-      this.getList()
+      this.get_table_data()
     },
     handleClick(tab, event) {
       console.log(tab, event)
       if (tab.name === 'second') {
-        this.getList2()
+        this.get_table_data2()
       } else {
-        this.getList()
+        this.get_table_data()
       }
     },
-    getList2() {
+    get_table_data2() {
       this.listLoading2 = true
       if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
         this.getdataListParm2.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
@@ -927,7 +927,7 @@ export default {
         this.getdataListParm2.parammaps.inputDatetime = ''
       }
       this.getdataListParm2.offset = 1
-      this.getList2()
+      this.get_table_data2()
     },
     resetCreateTemp() {
       this.createTemp.useForm = ''
@@ -1026,7 +1026,7 @@ export default {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
 
                 that.selectList = []
-                that.getList()
+                that.get_table_data()
                 
                 } else {
                   that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -1066,7 +1066,7 @@ export default {
       //         if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
 
-      //           that.getList()
+      //           that.get_table_data()
                 
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -1263,7 +1263,7 @@ export default {
                 this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
                 this.dialogFormVisible = false
                 setTimeout(() => {
-                  this.getList()
+                  this.get_table_data()
                 }, 1000)
               }
             })
@@ -1335,7 +1335,7 @@ export default {
           id: row.id
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '删除成功',
@@ -1439,9 +1439,9 @@ export default {
     handleEAS() {
       this.easStatus.dialogStatus = 'easStatus'
       this.easStatus.dialogFormVisible = true
-      this.getListEasStatusLst()
+      this.get_table_dataEasStatusLst()
     },
-    getListEasStatusLst() {
+    get_table_dataEasStatusLst() {
       this.easStatus.listLoading = true
       GetDataByName(this.easStatus.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -1471,12 +1471,12 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '关闭同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {
@@ -1493,12 +1493,12 @@ export default {
         EasSync(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '手动同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {
@@ -1517,12 +1517,12 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '忽略同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {

src/views/custom/returngoods/index.vue

@@ -106,7 +106,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset":limit.sync="getdataListParm.pagecount"@pagination="getList" />
+        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset":limit.sync="getdataListParm.pagecount"@pagination="get_table_data" />
       </el-tab-pane>
       <el-tab-pane label="退货记录" name="second">
         <div class="filter-container">
@@ -220,7 +220,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="getList2" />
+        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="get_table_data2" />
       </el-tab-pane>
     </el-tabs>
     <!-- 弹出层新增or修改 -->
@@ -380,7 +380,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -598,10 +598,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="getListEasStatusLst" />
+        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="get_table_dataEasStatusLst" />
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button @click="easStatus.dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button @click="easStatus.dialogFormVisible = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -855,7 +855,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getPendingList()
   },
 
@@ -941,7 +941,7 @@ export default {
         this.pending.total = response.data.total3
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -969,12 +969,12 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event)
       if (tab.name === 'second') {
-        this.getList2()
+        this.get_table_data2()
       } else {
-        this.getList()
+        this.get_table_data()
       }
     },
-    getList2() {
+    get_table_data2() {
       this.listLoading2 = true
       if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
         this.getdataListParm2.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
@@ -1002,7 +1002,7 @@ export default {
         this.getdataListParm2.parammaps.inputDatetime = ''
       }
       this.getdataListParm2.offset = 1
-      this.getList2()
+      this.get_table_data2()
     },
 
     changeAll() {
@@ -1017,7 +1017,7 @@ export default {
           startTime: '',
           stopTime: ''
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '待处理') {
         this.getdataListParm.name = 'getBigPartrefundWebListNO'
         this.getdataListParm.offset = 1
@@ -1031,7 +1031,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '已处理') {
         this.getdataListParm.name = 'getBigPartrefundWebList'
         this.getdataListParm.offset = 1
@@ -1045,7 +1045,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       }
     },
     statue: function(cellValue) {
@@ -1069,7 +1069,7 @@ export default {
       }
       this.getdataListParm.offset = 1
       this.listLoading = true
-      this.getList()
+      this.get_table_data()
       this.getPendingList()
     },
     resetCreateTemp() {
@@ -1131,7 +1131,7 @@ export default {
               if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
-                that.getList()
+                that.get_table_data()
                 
                 } else {
                   that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -1172,7 +1172,7 @@ export default {
                 
       //         if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
-      //           that.getList()
+      //           that.get_table_data()
                 
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -1412,7 +1412,7 @@ export default {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
             setTimeout(() => {
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
             }, 1000)
             this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
@@ -1583,7 +1583,7 @@ export default {
           } else {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.getPendingList()
             this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
           }
@@ -1659,7 +1659,7 @@ export default {
           bigId: row.id
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.getPendingList()
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
         })
@@ -1711,7 +1711,7 @@ export default {
             console.log('主管审核确认发送参数', this.requestParam)
             if (response.msg !== 'fail') {
               setTimeout(() => {
-                this.getList()
+                this.get_table_data()
               }, 1000)
               this.dialogFormVisible_Examine = false
               this.dialogFormVisibleSee = false
@@ -1773,7 +1773,7 @@ export default {
                 this.dialogFormVisible_Examine = false
                 this.dialogFormVisibleSee = false
                 setTimeout(() => {
-                  this.getList()
+                  this.get_table_data()
                 }, 1000)
                 this.getPendingList()
                 this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
@@ -1790,7 +1790,7 @@ export default {
               console.log('采购审核确认发送参数', this.requestParam)
               if (response.msg !== 'fail') {
                 setTimeout(() => {
-                  this.getList()
+                  this.get_table_data()
                 }, 1000)
                 this.dialogFormVisible_Examine = false
                 this.dialogFormVisibleSee = false
@@ -1808,9 +1808,9 @@ export default {
     handleEAS() {
       this.easStatus.dialogStatus = 'easStatus'
       this.easStatus.dialogFormVisible = true
-      this.getListEasStatusLst()
+      this.get_table_dataEasStatusLst()
     },
-    getListEasStatusLst() {
+    get_table_dataEasStatusLst() {
       this.easStatus.listLoading = true
       GetDataByName(this.easStatus.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -1840,13 +1840,13 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '关闭同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
             this.getPendingList()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
             this.getPendingList()
           }
         })
@@ -1864,13 +1864,13 @@ export default {
         EasSync(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '手动同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
             this.getPendingList()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
             this.getPendingList()
           }
         })
@@ -1890,13 +1890,13 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '忽略同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
             this.getPendingList()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
             this.getPendingList()
           }
         })

src/views/custom/saplog/index.vue

@@ -68,7 +68,7 @@
 
 
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
 
   </div>
 
@@ -159,14 +159,14 @@ export default {
   },
 
   created () {
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
     tableSort1 (column) {
       sortChange(column, this.list)
     },
-    getList () {
+    get_table_data () {
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list !== null) {
           console.log('table数据', response.data.list)
@@ -200,7 +200,7 @@ export default {
     form_search () {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     tableCellStyle ({ row, column, rowIndex, columnIndex }) {
       if (row.pastureName !== '现代牧业' && row.departmentName == null && row.typeName == null && columnIndex === 1) {
@@ -287,7 +287,7 @@ export default {
       this.isTitle = false
       this.isDetailed = false
       this.listLoading = true
-      this.getList()
+      this.get_table_data()
     },
     handleDetailed (row) {
       console.log(row)

src/views/custom/storage/index.vue

@@ -116,7 +116,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+        <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
       </el-tab-pane>
       <el-tab-pane label="入库记录" name="second">
         <div class="filter-container">
@@ -219,7 +219,7 @@
           </el-table-column>
           <el-table-column label="入库日期" sortable prop="creatTime" min-width="120px" align="center" />
         </el-table>
-        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="getList2" />
+        <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="get_table_data2" />
       </el-tab-pane>
     </el-tabs>
     <!-- 弹出层新增or修改 -->
@@ -481,7 +481,7 @@
         />
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -687,10 +687,10 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="getListEasStatusLst" />
+        <pagination v-show="easStatus.total>0" :total="easStatus.total" :page.sync="easStatus.getdataListParm.offset" :limit.sync="easStatus.getdataListParm.pagecount" @pagination="get_table_dataEasStatusLst" />
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button @click="easStatus.dialogFormVisible = false;getList()">关闭</el-button>
+        <el-button @click="easStatus.dialogFormVisible = false;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
   </div>
@@ -986,8 +986,8 @@ export default {
 
   created() {
     this.get_select_list()
-    this.getList()
-    this.getList2()
+    this.get_table_data()
+    this.get_table_data2()
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
@@ -1078,7 +1078,7 @@ export default {
         this.findAllProvider2 = response.data.findAllProvider.list
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -1103,12 +1103,12 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event)
       if (tab.name === 'second') {
-        this.getList2()
+        this.get_table_data2()
       } else {
-        this.getList()
+        this.get_table_data()
       }
     },
-    getList2() {
+    get_table_data2() {
       this.listLoading2 = true
       if (this.$refs['inputDatetime2'] !== undefined && this.$refs['inputDatetime2'].value !== null) {
         this.getdataListParm2.parammaps.startTime = this.$refs['inputDatetime2'].value[0]
@@ -1136,7 +1136,7 @@ export default {
         this.getdataListParm2.parammaps.inputDatetime = ''
       }
       this.getdataListParm2.offset = 1
-      this.getList2()
+      this.get_table_data2()
     },
     laidType: function(cellValue) {
       // console.log(cellValue.isZeroStock)
@@ -1155,7 +1155,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     // 查看详情
     form_see(row) {
@@ -1679,7 +1679,7 @@ export default {
               })
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1780,7 +1780,7 @@ export default {
               })
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1876,7 +1876,7 @@ export default {
               })
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -1971,7 +1971,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '',
@@ -2039,7 +2039,7 @@ export default {
               if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
-                that.getList()
+                that.get_table_data()
 
                 
                 } else {
@@ -2094,7 +2094,7 @@ export default {
                 
       //         if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
-      //           that.getList()
+      //           that.get_table_data()
                 
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
@@ -2136,7 +2136,7 @@ export default {
           id: row.id
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
         })
       }).catch(() => {
@@ -2504,9 +2504,9 @@ export default {
     handleEAS() {
       this.easStatus.dialogStatus = 'easStatus'
       this.easStatus.dialogFormVisible = true
-      this.getListEasStatusLst()
+      this.get_table_dataEasStatusLst()
     },
-    getListEasStatusLst() {
+    get_table_dataEasStatusLst() {
       this.easStatus.listLoading = true
       GetDataByName(this.easStatus.getdataListParm).then(response => {
         if (response.data.list !== null) {
@@ -2538,11 +2538,11 @@ export default {
           if (response.msg !== 'fl') {
             this.$notify({ title: '成功', message: '关闭同步成功', type: 'success', duration: 2000 })
             this.getLitEasStatusLs()
-            this.getList()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
             this.getLiEasStatusLst()
-            this.getList()
+            this.get_table_data()
           }
         })
       }).catch(() => {
@@ -2559,12 +2559,12 @@ export default {
         EasSync(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '手动同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {
@@ -2583,12 +2583,12 @@ export default {
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
             this.$notify({ title: '成功', message: '忽略同步成功', type: 'success', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           } else {
             this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getListEasStatusLst()
-            this.getList()
+            this.get_table_dataEasStatusLst()
+            this.get_table_data()
           }
         })
       }).catch(() => {

src/views/custom/subscribe/index.vue

@@ -96,7 +96,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="app-container">
@@ -270,7 +270,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -622,7 +622,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getPendingList()
   },
 
@@ -693,7 +693,7 @@ export default {
         this.pending.total = response.data.total3
       })
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -735,7 +735,7 @@ export default {
           logindeptId: Cookies.get('departmentid'),
           loginpastureId: Cookies.get('pastureid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '待处理') {
         this.getdataListParm.name = 'getpartpurchaseWebListNO'
         this.getdataListParm.offset = 1
@@ -755,7 +755,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '已处理') {
         this.getdataListParm.name = 'getpartpurchaseWebList'
         this.getdataListParm.offset = 1
@@ -775,7 +775,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       }
     },
     statue: function(cellValue) {
@@ -803,7 +803,7 @@ export default {
       }
       this.getdataListParm.offset = 1
       this.listLoading = true
-      this.getList()
+      this.get_table_data()
       this.getPendingList()
     },
     resetCreateTemp() {
@@ -1072,7 +1072,7 @@ export default {
           } else {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.getPendingList()
             this.$notify({
               title: '',
@@ -1280,7 +1280,7 @@ export default {
           } else {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '',
               message: '保存成功',
@@ -1392,7 +1392,7 @@ export default {
           bigId: row.id
         }}
         ExecDataByConfig(this.postDataPramas).then(response => {
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '删除成功',
@@ -1451,7 +1451,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('审核确认发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
               this.statueReason = false
@@ -1505,7 +1505,7 @@ export default {
           PostDataByName(this.requestParam).then(response => {
             console.log('审核确认发送参数', this.requestParam)
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
               this.statueReason = false
@@ -1570,7 +1570,7 @@ export default {
           }
           ExecDataByConfig(this.requestParam).then(response => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_Examine = false
               this.dialogFormVisible_See = false
               this.statueReason = false

src/views/custom/writeoff/index.vue

@@ -60,7 +60,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="table1.total>0" :total="table1.total" :page.sync="table1.getdataListParm.offset" :limit.sync="table1.getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="table1.total>0" :total="table1.total" :page.sync="table1.getdataListParm.offset" :limit.sync="table1.getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="app-container">
@@ -134,7 +134,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -235,7 +235,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -254,7 +254,7 @@ export default {
       this.isWriteoffDel = isWriteoffDel
     },
 
-    getList() {
+    get_table_data() {
       this.table1.listLoading = true
       GetDataByName(this.table1.getdataListParm).then(response => {
         if(response.data.list){
@@ -279,7 +279,7 @@ export default {
       console.log('点击了table搜索')
       this.table1.listLoading = true
       this.table1.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_add() {
       this.dialogStatus = 'create'

src/views/custom/writeoff/index1.vue

@@ -55,7 +55,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="table1.total>0" :total="table1.total" :page.sync="table1.getdataListParm.offset" :limit.sync="table1.getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="table1.total>0" :total="table1.total" :page.sync="table1.getdataListParm.offset" :limit.sync="table1.getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 弹出层新增or修改 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="app-container">
@@ -129,7 +129,7 @@
         </el-table>
         <div slot="footer" class="dialog-footer" style="bottom:10px">
           <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;get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -223,7 +223,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -242,7 +242,7 @@ export default {
       this.isWriteoffDel = isWriteoffDel
     },
 
-    getList() {
+    get_table_data() {
       this.table1.listLoading = true
       GetDataByName(this.table1.getdataListParm).then(response => {
         if(response.data.list){
@@ -267,7 +267,7 @@ export default {
       console.log('点击了table搜索')
       this.table1.listLoading = true
       this.table1.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     form_add() {
       this.dialogStatus = 'create'

src/views/dashboard/editor/index.vue

@@ -245,7 +245,7 @@ export default {
           data: [],
           Chart: null,
           // 预算、实际、达成率
-          getListParm: {
+          get_table_dataParm: {
             name: 'homepageRate',
             parammaps: {
               pastureName: '现代牧业'
@@ -392,7 +392,7 @@ export default {
       }
     },
     getRow2List1() {
-      GetDataByName(this.row2.chart1.getListParm).then(response => {
+      GetDataByName(this.row2.chart1.get_table_dataParm).then(response => {
         if (response.data.list !== null) {
           this.row2.chart1.list = response.data.list[0]
         } else {

src/views/electro/electroData/index.vue

@@ -156,7 +156,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <!-- 弹出层新增or修改 -->
     <el-dialog
@@ -487,7 +487,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -510,7 +510,7 @@ export default {
       this.temp.providerId = item.id
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -539,7 +539,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -593,7 +593,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -637,7 +637,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -660,7 +660,7 @@ export default {
         this.requestParam.parammaps = {}
         this.requestParam.parammaps['id'] = row.id
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({
             title: '成功',

src/views/evaluationVerification/assessment/index.vue

@@ -54,7 +54,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+      <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
       <!-- 评估/编辑 -->
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisibleAdd" :close-on-click-modal="false" width="80%">
         <div class="app-add">
@@ -249,7 +249,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="totalSee>0" :total="totalSee" :page.sync="getdataListParmSee.offset" :limit.sync="getdataListParmSee.pagecount" @pagination="getListSee" />
+          <pagination v-show="totalSee>0" :total="totalSee" :page.sync="getdataListParmSee.offset" :limit.sync="getdataListParmSee.pagecount" @pagination="get_table_dataSee" />
         </div>
         <div slot="footer" class="dialog-footer" style="bottom:5px">
           <el-button class="filter-item" type="success" icon="el-icon-upload2" @click="handleDownloadSee">导出</el-button>
@@ -302,7 +302,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="getList2" />
+      <pagination v-show="total2>0" :total="total2" :page.sync="getdataListParm2.offset" :limit.sync="getdataListParm2.pagecount" @pagination="get_table_data2" />
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="80%">
         <div class="app-add">
           <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="110px" style="width:80%;margin:0 auto;">
@@ -351,7 +351,7 @@
           </el-table>
           <div slot="footer" class="dialog-footer">
             <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;get_table_data2();">取消并关闭</el-button>
           </div>
         </div>
       </el-dialog>
@@ -512,7 +512,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     console.log(this.uploadImageUrl)
   },
   methods: {
@@ -522,7 +522,7 @@ export default {
         this.findAllEmploye = response.data.findAllEmploye.list
       })
     },
-    getList() {
+    get_table_data() {
       console.log(this.$refs['inputDatetime'], '------------------')
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
@@ -551,7 +551,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
 
     form_see(row) {
@@ -559,9 +559,9 @@ export default {
       this.seeTemp = Object.assign(row, {})
       this.dialogStatus = 'see'
       this.dialogFormVisibleSee = true
-      this.getListSee()
+      this.get_table_dataSee()
     },
-    getListSee() {
+    get_table_dataSee() {
       this.listLoadingSee = true
       this.getdataListParmSee.parammaps.id = this.seeTemp.id
       GetDataByName(this.getdataListParmSee).then(response => {
@@ -699,14 +699,14 @@ export default {
       this.dialogStatus = 'assessment'
       this.dialogFormVisibleAdd = true
       this.listAdd = []
-      this.getList2()
+      this.get_table_data2()
     },
     changeStatue(val) {
       // this.createTemp.statue = parseInt(val)
       // console.log(val)
       this.listAdd = []
       this.getdataListParmSee2.parammaps.id = val
-      this.getListSee2()
+      this.get_table_dataSee2()
       if (this.list2.find(obj => obj.id == val)) {
         console.log(this.list2.find(obj => obj.id == val).statue)
         this.judgetype = this.list2.find(obj => obj.id == val).statue
@@ -862,7 +862,7 @@ export default {
               })
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisibleAdd = false
               this.createTemp.providerName = ''
               this.$notify({
@@ -889,10 +889,10 @@ export default {
       this.dialogStatus = 'update'
       this.dialogFormVisibleAdd = true
       this.createTemp = Object.assign(row, {})
-      this.getListUpdate()
-      this.getList2()
+      this.get_table_dataUpdate()
+      this.get_table_data2()
     },
-    getListUpdate() {
+    get_table_dataUpdate() {
       this.listLoadingAdd = true
       this.getdataListParmUpdate.parammaps.id = this.createTemp.id
       GetDataByName(this.getdataListParmUpdate).then(response => {
@@ -1004,7 +1004,7 @@ export default {
               })
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisibleAdd = false
               this.createTemp.providerName = ''
               this.$notify({
@@ -1045,7 +1045,7 @@ export default {
               })
             } else {
               this.getdataListParm.parammaps.inputDatetime = ''
-              this.getList()
+              this.get_table_data()
               this.$notify({
                 title: '',
                 message: '删除成功',
@@ -1063,7 +1063,7 @@ export default {
         })
     },
 
-    getList2() {
+    get_table_data2() {
       this.listLoading2 = true
       // this.listLoadingAdd = true
       GetDataByName(this.getdataListParm2).then(response => {
@@ -1093,13 +1093,13 @@ export default {
       // table1隐藏/table2显示
       this.List1 = false
       this.List2 = true
-      this.getList2()
+      this.get_table_data2()
     },
     goBack() {
       // table1显示/table2隐藏
       this.List1 = true
       this.List2 = false
-      this.getList()
+      this.get_table_data()
     },
     form_add2() {
       console.log('点击了检查标准管理-新增')
@@ -1136,7 +1136,7 @@ export default {
       return isLt2M
     },
     handleImportExcelSuccess2(res, file) {
-      this.getList2()
+      this.get_table_data2()
       if (res.msg === 'ok') {
         this.$message({
           title: '成功',
@@ -1256,7 +1256,7 @@ export default {
                   duration: 2000
                 })
               } else {
-                this.getList2()
+                this.get_table_data2()
                 this.dialogFormVisible = false
                 this.$notify({
                   title: '',
@@ -1284,9 +1284,9 @@ export default {
       this.dialogStatus = 'see'
       this.dialogFormVisible = true
       this.getdataListParmSee2.parammaps.id = row.id
-      this.getListSee2()
+      this.get_table_dataSee2()
     },
-    getListSee2() {
+    get_table_dataSee2() {
       GetDataByName(this.getdataListParmSee2).then(response => {
         if (response.data.list !== null) {
           this.listAdd = response.data.list
@@ -1311,7 +1311,7 @@ export default {
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.getdataListParmSee2.parammaps.id = row.id
-      this.getListSee2()
+      this.get_table_dataSee2()
     },
     edit_dialog_save2() {
       this.isokDisable = true
@@ -1357,7 +1357,7 @@ export default {
                   duration: 2000
                 })
               } else {
-                this.getList2()
+                this.get_table_data2()
                 this.dialogFormVisible = false
                 this.$notify({
                   title: '',
@@ -1390,7 +1390,7 @@ export default {
         this.postDataParam.parammaps = {}
         this.postDataParam.parammaps.id = row.id
         PostDataByName(this.postDataParam).then(() => {
-          this.getList2()
+          this.get_table_data2()
           this.dialogFormVisible = false
           this.$notify({
             title: '成功',

src/views/form/index.vue

@@ -71,11 +71,11 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
   methods: {
 
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByNames(this.requestParams).then(response => {
         this.fileList = response.data.getcustompicbycustomid.list

src/views/knowledgeBase/file/index.vue

@@ -91,7 +91,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="totalDetail>0" :total="totalDetail" :page.sync="getdataListParmDetail.offset" :limit.sync="getdataListParmDetail.pagecount" @pagination="getListDetail" />
+      <pagination v-show="totalDetail>0" :total="totalDetail" :page.sync="getdataListParmDetail.offset" :limit.sync="getdataListParmDetail.pagecount" @pagination="get_table_dataDetail" />
     </div>
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="50%">
       <div class="app-content">
@@ -113,7 +113,7 @@
         </el-form>
         <div slot="footer" class="dialog-footer" style="right:30px;position:absolute;bottom:5px">
           <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; get_table_data()">取消并关闭</el-button>
         </div>
       </div>
     </el-dialog>
@@ -220,10 +220,10 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.get_table_data()
   },
   methods: {
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         console.log('list数据', response.data.list)
@@ -270,7 +270,7 @@ export default {
     form_search2() {
       console.log('点击了局部搜索')
       this.getdataListParmDetail.offset = 1
-      this.getListDetail()
+      this.get_table_dataDetail()
     },
     resetCreateTemp() {
       this.createTemp.direct = ''
@@ -295,7 +295,7 @@ export default {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
               this.dialogFormVisible = false
-              this.getList()
+              this.get_table_data()
               this.$notify({
                 title: '成功',
                 message: '新增成功',
@@ -334,7 +334,7 @@ export default {
         console.log('修改保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
           this.dialogFormVisible = false
-          this.getList()
+          this.get_table_data()
           this.$notify({
             title: '成功',
             message: '修改成功',
@@ -367,10 +367,10 @@ export default {
       this.isFilter1 = false
       this.isFilter2 = true
       this.getdataListParmDetail.parammaps.id = item.id
-      this.getListDetail()
+      this.get_table_dataDetail()
     },
     // 文件详情
-    getListDetail() {
+    get_table_dataDetail() {
       this.listLoadingDetail = true
       GetDataByName(this.getdataListParmDetail).then(response => {
         console.log('list数据', response.data.list)
@@ -442,7 +442,7 @@ export default {
                 })
               } else {
                 this.dialogFormVisible = false
-                this.getList()
+                this.get_table_data()
                 this.$notify({
                   title: '',
                   message: '删除成功',
@@ -488,7 +488,7 @@ export default {
           type: 'success',
           duration: 2000
         })
-        this.getListDetail()
+        this.get_table_dataDetail()
       } else {
         this.$notify({
           title: '失败',
@@ -594,7 +594,7 @@ export default {
                     type: 'success',
                     duration: 2000
                   })
-                  this.getListDetail()
+                  this.get_table_dataDetail()
                 } else {
                   this.$notify({
                     title: '失败',
@@ -666,7 +666,7 @@ export default {
             type: 'success',
             duration: 2000
           })
-          this.getListDetail()
+          this.get_table_dataDetail()
         } else {
           this.$notify({
             title: '失败',

src/views/maintenance/maintain/index.vue

@@ -128,7 +128,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 查看 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible_See" :close-on-click-modal="false"  v-if ="dialogFormVisible_See" width="90%">
       <div class="app-see">
@@ -1147,7 +1147,7 @@ export default {
       this.getdataListParm.parammaps.stopTime = this.$route.query.time
     }
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getPendingList()
   },
   methods: {
@@ -1237,7 +1237,7 @@ export default {
         this.pending.total = response.data.total3
       })
     },
-    getList() {
+    get_table_data() {
       if (this.getdataListParm.parammaps.inputDatetime !== undefined && this.getdataListParm.parammaps.inputDatetime !== '') {
         this.getdataListParm.parammaps.startTime = this.getdataListParm.parammaps.inputDatetime[0]
         this.getdataListParm.parammaps.stopTime = this.getdataListParm.parammaps.inputDatetime[1]
@@ -1295,7 +1295,7 @@ export default {
           logindeptId: Cookies.get('departmentid'),
           loginpastureId: Cookies.get('pastureid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '待处理') {
         this.getdataListParm.name = 'getBigupkeepWebListNO'
         this.getdataListParm.offset = 1
@@ -1316,7 +1316,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '已处理') {
         this.getdataListParm.name = 'getBigupkeepWebList'
         this.getdataListParm.offset = 1
@@ -1338,7 +1338,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       }
     },
     statue: function(cellValue) {
@@ -1378,7 +1378,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
       this.getPendingList()
     },
     form_see(row) {
@@ -1590,7 +1590,7 @@ export default {
             } else {
               this.dialogFormVisible_ReceivingSpareParts = false
               this.dialogFormVisible_See = false
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
             }
@@ -1671,7 +1671,7 @@ export default {
               } else {
                 this.dialogFormVisible_ReceivingSpareParts = false
                 this.dialogFormVisible_See = false
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               }
@@ -1807,7 +1807,7 @@ export default {
                         if (this.getdataListParm.parammaps.inputDatetime === null) {
                           this.getdataListParm.parammaps.inputDatetime = ''
                         }
-                        this.getList()
+                        this.get_table_data()
                         this.dialogFormVisible_maintainComplete = false
                         this.dialogFormVisible_See = false
                         this.getPendingList()
@@ -1827,7 +1827,7 @@ export default {
                   this.dialogFormVisible_maintainComplete = false
                   this.dialogFormVisible_See = false
                   this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
-                  this.getList()
+                  this.get_table_data()
                   this.getPendingList()
               }
 
@@ -1902,7 +1902,7 @@ export default {
                   } else {
                     this.dialogFormVisible_maintainComplete = false
                     this.dialogFormVisible_See = false
-                    this.getList()
+                    this.get_table_data()
                     this.getPendingList()
                     this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
                   }
@@ -1975,7 +1975,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_examine = false
               this.dialogFormVisible_See = false
               this.isStatueReason = false
@@ -2026,7 +2026,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2058,7 +2058,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2109,7 +2109,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2141,7 +2141,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false

src/views/maintenance/maintain/index备份.vue

@@ -127,7 +127,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 查看 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible_See" :close-on-click-modal="false" width="90%">
       <div class="app-see">
@@ -572,7 +572,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom:5px;">
-        <el-button @click="dialogFormVisible_See = false;getList();">关闭</el-button>
+        <el-button @click="dialogFormVisible_See = false;get_table_data();">关闭</el-button>
       </div>
     </el-dialog>
     <!-- 保养及领用 -->
@@ -1146,7 +1146,7 @@ export default {
       this.getdataListParm.parammaps.stopTime = this.$route.query.time
     }
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getPendingList()
   },
   methods: {
@@ -1231,7 +1231,7 @@ export default {
         this.pending.total = response.data.total3
       })
     },
-    getList() {
+    get_table_data() {
       if (this.getdataListParm.parammaps.inputDatetime !== undefined && this.getdataListParm.parammaps.inputDatetime !== '') {
         this.getdataListParm.parammaps.startTime = this.getdataListParm.parammaps.inputDatetime[0]
         this.getdataListParm.parammaps.stopTime = this.getdataListParm.parammaps.inputDatetime[1]
@@ -1289,7 +1289,7 @@ export default {
           logindeptId: Cookies.get('departmentid'),
           loginpastureId: Cookies.get('pastureid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '待处理') {
         this.getdataListParm.name = 'getBigupkeepWebListNO'
         this.getdataListParm.offset = 1
@@ -1310,7 +1310,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '已处理') {
         this.getdataListParm.name = 'getBigupkeepWebList'
         this.getdataListParm.offset = 1
@@ -1332,7 +1332,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       }
     },
     statue: function(cellValue) {
@@ -1372,7 +1372,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
       this.getPendingList()
     },
     form_see(row) {
@@ -1584,7 +1584,7 @@ export default {
             } else {
               this.dialogFormVisible_ReceivingSpareParts = false
               this.dialogFormVisible_See = false
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
             }
@@ -1665,7 +1665,7 @@ export default {
               } else {
                 this.dialogFormVisible_ReceivingSpareParts = false
                 this.dialogFormVisible_See = false
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               }
@@ -1789,7 +1789,7 @@ export default {
               this.dialogFormVisible_maintainComplete = false
               this.dialogFormVisible_See = false
               this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
               // 临时注释
               // if (this.maintainCompleteTemp.videoTxt == '已录制') {
@@ -1807,7 +1807,7 @@ export default {
               //     this.dialogFormVisible_maintainComplete = false
               //     this.dialogFormVisible_See = false
               //     this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
-              //     this.getList()
+              //     this.get_table_data()
               //     this.getPendingList()
               //   } else {
               //     failproccess(response, this.$notify)
@@ -1882,7 +1882,7 @@ export default {
                   } else {
                     this.dialogFormVisible_maintainComplete = false
                     this.dialogFormVisible_See = false
-                    this.getList()
+                    this.get_table_data()
                     this.getPendingList()
                     this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
                   }
@@ -1955,7 +1955,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_examine = false
               this.dialogFormVisible_See = false
               this.isStatueReason = false
@@ -2006,7 +2006,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2038,7 +2038,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2089,7 +2089,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2121,7 +2121,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false

src/views/maintenance/maintain/index改好.vue

@@ -126,7 +126,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 查看 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible_See" :close-on-click-modal="false" width="90%">
       <div class="app-see">
@@ -571,7 +571,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom:5px;">
-        <el-button @click="dialogFormVisible_See = false;getList();">关闭</el-button>
+        <el-button @click="dialogFormVisible_See = false;get_table_data();">关闭</el-button>
       </div>
     </el-dialog>
     <!-- 保养及领用 -->
@@ -1145,7 +1145,7 @@ export default {
       this.getdataListParm.parammaps.stopTime = this.$route.query.time
     }
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
     this.getPendingList()
   },
   methods: {
@@ -1230,7 +1230,7 @@ export default {
         this.pending.total = response.data.total3
       })
     },
-    getList() {
+    get_table_data() {
       if (this.getdataListParm.parammaps.inputDatetime !== undefined && this.getdataListParm.parammaps.inputDatetime !== '') {
         this.getdataListParm.parammaps.startTime = this.getdataListParm.parammaps.inputDatetime[0]
         this.getdataListParm.parammaps.stopTime = this.getdataListParm.parammaps.inputDatetime[1]
@@ -1288,7 +1288,7 @@ export default {
           logindeptId: Cookies.get('departmentid'),
           loginpastureId: Cookies.get('pastureid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '待处理') {
         this.getdataListParm.name = 'getBigupkeepWebListNO'
         this.getdataListParm.offset = 1
@@ -1309,7 +1309,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '已处理') {
         this.getdataListParm.name = 'getBigupkeepWebList'
         this.getdataListParm.offset = 1
@@ -1331,7 +1331,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       }
     },
     statue: function(cellValue) {
@@ -1371,7 +1371,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
       this.getPendingList()
     },
     form_see(row) {
@@ -1583,7 +1583,7 @@ export default {
             } else {
               this.dialogFormVisible_ReceivingSpareParts = false
               this.dialogFormVisible_See = false
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
               this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
             }
@@ -1664,7 +1664,7 @@ export default {
               } else {
                 this.dialogFormVisible_ReceivingSpareParts = false
                 this.dialogFormVisible_See = false
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
               }
@@ -1800,7 +1800,7 @@ export default {
                         if (this.getdataListParm.parammaps.inputDatetime === null) {
                           this.getdataListParm.parammaps.inputDatetime = ''
                         }
-                        this.getList()
+                        this.get_table_data()
                         this.dialogFormVisible_maintainComplete = false
                         this.dialogFormVisible_See = false
                         this.getPendingList()
@@ -1820,7 +1820,7 @@ export default {
                   this.dialogFormVisible_maintainComplete = false
                   this.dialogFormVisible_See = false
                   this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
-                  this.getList()
+                  this.get_table_data()
                   this.getPendingList()
               }
 
@@ -1895,7 +1895,7 @@ export default {
                   } else {
                     this.dialogFormVisible_maintainComplete = false
                     this.dialogFormVisible_See = false
-                    this.getList()
+                    this.get_table_data()
                     this.getPendingList()
                     this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
                   }
@@ -1968,7 +1968,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_examine = false
               this.dialogFormVisible_See = false
               this.isStatueReason = false
@@ -2019,7 +2019,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2051,7 +2051,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2102,7 +2102,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false
                 this.isStatueReason = false
@@ -2134,7 +2134,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.dialogFormVisible_examine = false
                 this.dialogFormVisible_See = false

src/views/maintenance/maintenancePlan/index.vue

@@ -52,7 +52,7 @@
         <el-table-column :key="index" show-overflow-tooltip :prop="item.column_name" :label="item.label" :width="item.width" />
       </template>
     </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false" width="50%">
       <div class="content-add">
         <el-form
@@ -297,7 +297,7 @@ export default {
         this.getdataListParm.parammaps.pastureName = Cookies.get('pasturename')
         this.getdataListParm.parammaps.eqCode = ''
       }
-      this.getList()
+      this.get_table_data()
     } else {
       if (this.$route.query.pastureName !== undefined && this.$route.query.eqCode !== undefined) {
         this.getdataListParm.parammaps.pastureName = this.$route.query.pastureName
@@ -306,7 +306,7 @@ export default {
         this.getdataListParm.parammaps.pastureName = Cookies.get('pasturename')
         this.getdataListParm.parammaps.eqCode = ''
       }
-      this.getList()
+      this.get_table_data()
     }
     this.getTypeList()
     this.get_select_list()
@@ -375,7 +375,7 @@ export default {
       this.getdataListParm.parammaps.departmentId = ''
       this.getDepartDownList()
     },
-    getList() {
+    get_table_data() {
       this.listLoading = true
       // this.getdataListParm.month = parseTime(new Date(), '{y}-{m}') // 更改为请求的月份
       // this.getdataListParm.month = '2020-03' // 更改为请求的月份
@@ -443,7 +443,7 @@ export default {
       } else {
         this.getdataListParm.parammaps.typeCode = this.dataform.typeCode
       }
-      this.getList()
+      this.get_table_data()
     },
     form_search() {
       this.listLoading = true
@@ -453,7 +453,7 @@ export default {
         this.getdataListParm.parammaps.typeCode = this.dataform.typeCode
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     tableCellClassName({ row, column, rowIndex, columnIndex }) {
       row.index = rowIndex
@@ -566,7 +566,7 @@ export default {
                 this.requestParam.parammaps.id = row.id
                 this.requestParam.parammaps.monthIN = this.getdataListParm.month
                 PostDataByName(this.requestParam).then(() => {
-                  this.getList()
+                  this.get_table_data()
                   this.dialogFormVisible = false
                   this.$notify({ title: '成功', message: '清空成功', type: 'success', duration: 2000 })
                 })
@@ -701,7 +701,7 @@ export default {
           } else {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '',
               message: '保存成功',
@@ -798,7 +798,7 @@ export default {
           } else {
             this.dialogFormVisible = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '',
               message: '保存成功',
@@ -822,7 +822,7 @@ export default {
         console.log('要分割值', this.updateValue)
         this.requestParam.parammaps.id = (this.updateValue).split('#')[3]
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({
             title: '成功',
@@ -886,7 +886,7 @@ export default {
           } else {
             this.dialogFormVisibleBtn = false
             this.getdataListParm.parammaps.inputDatetime = ''
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '',
               message: '保存成功',
@@ -978,7 +978,7 @@ export default {
         this.requestParam.parammaps.departmentId = this.getdataListParm.parammaps.departmentId
         this.requestParam.parammaps.monthIN = this.getdataListParm.month
         PostDataByName(this.requestParam).then(() => {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({
             title: '成功',

src/views/maintenance/repair/index.vue

@@ -147,7 +147,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
   
   
       <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible_Create" :close-on-click-modal="false" width="90%">
@@ -270,7 +270,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <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;get_table_data()">关闭</el-button>
       </div>
     </el-dialog>
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible_See" :close-on-click-modal="false" width="90%">
@@ -1059,7 +1059,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom:5px">
         <el-button v-if="rapairBtn" type="primary" :disabled="isokDisable" @click="dialogStatus==='maintenanceRequisition'?createMaintenanceRequisitionteData():createMaintenanceRequisitionteData()">确认</el-button>
-        <el-button @click="dialogFormVisible_MaintenanceRequisition = false;getList();">关闭</el-button>
+        <el-button @click="dialogFormVisible_MaintenanceRequisition = false;get_table_data();">关闭</el-button>
       </div>
     </el-dialog>
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible_CollectionSparePartsSee" :close-on-click-modal="false" width="90%">
@@ -1739,7 +1739,7 @@ export default {
       const isRepairExport = checkButtons(this.buttons, RejectExport)
       this.isRepairExport = isRepairExport
       this.get_select_list()
-      this.getList()
+      this.get_table_data()
       this.getPendingList()
     },
     get_select_list() {
@@ -1767,7 +1767,7 @@ export default {
         this.pending.total = response.data.total3
       })
     },
-    getList() {
+    get_table_data() {
       if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
         this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
         this.getdataListParm.parammaps.stopTime = this.$refs['inputDatetime'].value[1]
@@ -1804,7 +1804,7 @@ export default {
           logindeptId: Cookies.get('departmentid'),
           loginpastureId: Cookies.get('pastureid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '待处理') {
         this.getdataListParm.name = 'getRepirsWebListNO'
         this.getdataListParm.offset = 1
@@ -1825,7 +1825,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       } else if (this.radioAll === '已处理') {
         this.getdataListParm.name = 'getRepirsWebList'
         this.getdataListParm.offset = 1
@@ -1845,7 +1845,7 @@ export default {
           pastureId: Cookies.get('pastureid'),
           deptId: Cookies.get('departmentid')
         }
-        this.getList()
+        this.get_table_data()
       }
     },
     orderStatue: function(cellValue) {
@@ -1883,7 +1883,7 @@ export default {
         this.getdataListParm.parammaps.inputDatetime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
       this.getPendingList()
     },
     resetCreateTemp() {
@@ -1982,7 +1982,7 @@ export default {
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
-          this.getList()
+          this.get_table_data()
           this.getPendingList()
           this.dialogFormVisible_Create = false
           this.$notify({ title: '成功', message: '新增成功', type: 'success', duration: 2000 })
@@ -2144,7 +2144,7 @@ export default {
             console.log('派单确认发送参数', this.requestParam)
             if (response.msg !== 'fail') {
               this.listLoading = true
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible_DistributeLeaflets = false
               this.dialogFormVisible_See = false
               this.getPendingList()
@@ -2255,7 +2255,7 @@ export default {
               if (this.getdataListParm.parammaps.inputDatetime === null) {
                 this.getdataListParm.parammaps.inputDatetime = ''
               }
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
               this.dialogFormVisible_MaintenanceAudit = false
               this.dialogFormVisible_See = false
@@ -2306,7 +2306,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.dialogFormVisible_MaintenanceAudit = false
                 this.dialogFormVisible_See = false
@@ -2338,7 +2338,7 @@ export default {
                 if (this.getdataListParm.parammaps.inputDatetime === null) {
                   this.getdataListParm.parammaps.inputDatetime = ''
                 }
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.dialogFormVisible_MaintenanceAudit = false
                 this.dialogFormVisible_See = false
@@ -2369,7 +2369,7 @@ export default {
         this.requestParam.parammaps.id = this.receiptTemp.id
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
-            this.getList()
+            this.get_table_data()
             this.getPendingList()
             this.dialogFormVisible_See = false
             this.$notify({ title: '成功', message: '接单成功', type: 'success', duration: 2000 })
@@ -2414,7 +2414,7 @@ export default {
             this.requestParam.parammaps.id = this.repairCompleteTemp.id
             PostDataByName(this.requestParam).then((response) => {
               if (response.msg !== 'fail') {
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.dialogFormVisible_RepairComplete = false
                 this.dialogFormVisible_See = false
@@ -2478,7 +2478,7 @@ export default {
                       this.listAdd = []
                       this.dialogFormVisible_RepairComplete = false
                       this.dialogFormVisible_See = false
-                      this.getList()
+                      this.get_table_data()
                       this.getPendingList()
                       this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
                     }
@@ -2696,7 +2696,7 @@ export default {
               if (response.msg === 'fail') {
                 this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
               } else {
-                this.getList()
+                this.get_table_data()
                 this.getPendingList()
                 this.dialogFormVisible_MaintenanceRequisition = false
                 this.dialogFormVisible_See = false
@@ -3103,7 +3103,7 @@ export default {
         this.requestParam.parammaps.id = row.id
         PostDataByName(this.requestParam).then((response) => {
           if (response.msg !== 'fail') {
-            this.getList()
+            this.get_table_data()
             this.getPendingList()
             this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
           } else {
@@ -3135,7 +3135,7 @@ export default {
           this.requestParam.parammaps.shutdownReason = this.rejectRepair.temp.shutdownReason
           PostDataByName(this.requestParam).then((response) => {
             if (response.msg !== 'fail') {
-              this.getList()
+              this.get_table_data()
               this.getPendingList()
               this.rejectRepair.dialogFormVisible = false
               this.$notify({ title: '成功', message: '驳回成功', type: 'success', duration: 2000 })

src/views/maintenance/spotCheck/index.vue

@@ -141,7 +141,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <!-- 弹出层点检 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
@@ -484,7 +484,7 @@ export default {
       that.get_auto_buttons()
     })
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -666,7 +666,7 @@ export default {
     },
 
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
 
       // if (this.getdataListParm.parammaps.date === null) {
@@ -719,7 +719,7 @@ export default {
         this.getdataListParm.parammaps.stopTime = ''
       }
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -789,7 +789,7 @@ export default {
     //         duration: 2000
     //       })
     //     } else {
-    //       this.getList()
+    //       this.get_table_data()
     //       this.dialogFormVisible = false
     //       this.$notify({
     //         title: '',
@@ -830,7 +830,7 @@ export default {
             duration: 2000
           })
         } else {
-          this.getList()
+          this.get_table_data()
           this.dialogFormVisible = false
           this.$notify({
             title: '',
@@ -900,7 +900,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -927,7 +927,7 @@ export default {
           this.postDataPramas.data[1] = { 'name': 'deleteBigSpotcheck', 'type': 'e', 'parammaps': {}}
           this.postDataPramas.data[1].parammaps['id'] = row.id
           ExecDataByConfig(this.postDataPramas).then(response => {
-            this.getList()
+            this.get_table_data()
             this.$notify({
               title: '成功',
               message: '删除成功',

src/views/maintenance/upkeep/index.vue

@@ -247,7 +247,7 @@
       :total="total"
       :page.sync="getdataListParm.offset"
       :limit.sync="getdataListParm.pagecount"
-      @pagination="getList"
+      @pagination="get_table_data"
     />
     <!-- 弹出层新增or修改 -->
     <el-dialog
@@ -527,7 +527,7 @@ export default {
   },
   created() {
     this.get_select_list()
-    this.getList()
+    this.get_table_data()
   },
 
   methods: {
@@ -551,7 +551,7 @@ export default {
       console.log(item)
     },
     // 1-1: table&搜索
-    getList() {
+    get_table_data() {
       this.listLoading = true
       GetDataByName(this.getdataListParm).then(response => {
         this.list = response.data.list
@@ -578,7 +578,7 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
-      this.getList()
+      this.get_table_data()
     },
     handleModifyStatus(row, status) {
       this.$message({
@@ -617,7 +617,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -653,7 +653,7 @@ export default {
                 duration: 2000
               })
             } else {
-              this.getList()
+              this.get_table_data()
               this.dialogFormVisible = false
               this.$notify({
                 title: '成功',
@@ -677,7 +677,7 @@ export default {
           this.requestParam.parammaps = {}
           this.requestParam.parammaps['id'] = row.id
           PostDataByName(this.requestParam).then(() => {
-            this.getList()
+            this.get_table_data()
             this.dialogFormVisible = false
             this.$notify({
               title: '成功',

src/views/news/news.vue

@@ -7,7 +7,7 @@
           <el-table-column prop="repairCode" min-width="180" />
           <el-table-column prop="mesTime" min-width="180" />
         </el-table>
-        <pagination v-show="totalDCL>0" :total="totalDCL" :page.sync="getdataListParmDCL.offset" :limit.sync="getdataListParmDCL.pagecount" @pagination="getListDCL" />
+        <pagination v-show="totalDCL>0" :total="totalDCL" :page.sync="getdataListParmDCL.offset" :limit.sync="getdataListParmDCL.pagecount" @pagination="get_table_dataDCL" />
       </el-tab-pane>
       <el-tab-pane :label="sumAmountAll" name="second">
         <el-table :data="listAll" :row-style="rowStyle" :cell-style="cellStyle" :show-header="false">
@@ -15,7 +15,7 @@
           <el-table-column prop="repairCode" min-width="180" />
           <el-table-column prop="mesTime" min-width="180" />
         </el-table>
-        <pagination v-show="totalAll>0" :total="totalAll" :page.sync="getdataListParmAll.offset" :limit.sync="getdataListParmAll.pagecount" @pagination="getListALL" />
+        <pagination v-show="totalAll>0" :total="totalAll" :page.sync="getdataListParmAll.offset" :limit.sync="getdataListParmAll.pagecount" @pagination="get_table_dataALL" />
       </el-tab-pane>
       <el-tab-pane :label="sumAmountYCL" name="third">
         <el-table :data="listYCL" :row-style="rowStyle" :cell-style="cellStyle" :show-header="false">
@@ -23,7 +23,7 @@
           <el-table-column prop="repairCode" min-width="180" />
           <el-table-column prop="mesTime" min-width="180" />
         </el-table>
-        <pagination v-show="totalYCL>0" :total="totalYCL" :page.sync="getdataListParmYCL.offset" :limit.sync="getdataListParmYCL.pagecount" @pagination="getListYCL" />
+        <pagination v-show="totalYCL>0" :total="totalYCL" :page.sync="getdataListParmYCL.offset" :limit.sync="getdataListParmYCL.pagecount" @pagination="get_table_dataYCL" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -127,7 +127,7 @@ export default {
     }
   },
   created() {
-    this.getListDCL()
+    this.get_table_dataDCL()
     this.getNoMesCount()
     this.getAllMesCount()
     this.getMesCount()
@@ -158,16 +158,16 @@ export default {
     },
     handleClick(tab) {
       if (tab.name === 'second') {
-        this.getListALL()
+        this.get_table_dataALL()
       } else if (tab.name === 'third') {
-        this.getListYCL()
+        this.get_table_dataYCL()
       } else {
-        this.getListDCL()
+        this.get_table_dataDCL()
       }
     },
 
     // 待处理table
-    getListDCL() {
+    get_table_dataDCL() {
       this.listLoadingDCL = true
       GetDataByName(this.getdataListParmDCL).then(response => {
         console.log('待处理table数据', response.data.list)
@@ -184,7 +184,7 @@ export default {
     },
 
     // 全部
-    getListALL() {
+    get_table_dataALL() {
       this.listLoadingAll = true
       GetDataByName(this.getdataListParmAll).then(response => {
         console.log('全部table数据', response.data.list)
@@ -201,7 +201,7 @@ export default {
     },
 
     // 已处理
-    getListYCL() {
+    get_table_dataYCL() {
       this.listLoadingYCL = true
       GetDataByName(this.getdataListParmYCL).then(response => {
         console.log('已处理table数据', response.data.list)