自动 手动抄表查询修改

ems-ui-cloud/src/views/devmgr/meterData/index.vue

@@ -20,7 +20,7 @@
           </el-tab-pane>
         </el-tabs>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="计量设备" prop="deviceCode">
+      <el-form-item label="表计编号" prop="deviceCode">
         <el-input
           v-model="queryParams.deviceCode"
           placeholder="请输入计量设备"
@@ -50,8 +50,8 @@
 
         <el-table v-if="activeTab === 'first'" v-loading="loading" :data="elecMeterHList">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="园区名称" align="center" prop="areaCode" />
-          <el-table-column label="计量设备" align="center" prop="deviceCode" />
+          <el-table-column label="表计名称" align="left" prop="deviceName" width="200px"/>
+          <el-table-column label="表计编号" align="left" prop="deviceCode" />
           <el-table-column label="日期" align="center" prop="date" width="180">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
@@ -75,8 +75,8 @@
 
         <el-table v-if="activeTab === 'second'" v-loading="loading" :data="waterMeterHList">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="园区名称" align="center" prop="areaCode" />
-          <el-table-column label="计量设备" align="center" prop="deviceCode" />
+          <el-table-column label="表计名称" align="left" prop="deviceName" width="200"/>
+          <el-table-column label="表计编号" align="left" prop="deviceCode" />
           <el-table-column label="日期" align="center" prop="date" width="180">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>

ems-ui-cloud/src/views/devmgr/meterRead/index.vue

@@ -19,7 +19,7 @@
           </el-tab-pane>
         </el-tabs>
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-          <el-form-item label="设备代码" prop="deviceCode">
+          <el-form-item label="表记编号" prop="deviceCode">
             <el-input v-model="queryParams.deviceCode" placeholder="请输入设备代码" clearable @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item>
@@ -28,9 +28,9 @@
           </el-form-item>
         </el-form>
         <el-table v-loading="loading" :data="deviceList">
-          <el-table-column label="计量对象" align="left" prop="objName" width="300px">
+          <el-table-column label="表计名称" align="left" prop="deviceName" width="200px">
             <template slot-scope="scope">
-              <span>{{ "（" + getObjTypeName(scope.row.objType) + "）"+ scope.row.objName }}</span>
+              <span>{{ scope.row.deviceName }}</span>
             </template>
           </el-table-column>
           <el-table-column label="设备代码" align="center" prop="deviceCode" />
@@ -61,7 +61,7 @@
           @pagination="getList" />
         <el-dialog :title="fillTitle" :visible.sync="fillFormOpen" width="500px" append-to-body>
           <el-form ref="fillForm" :model="fillForm" label-width="150px">
-            <el-form-item label="设备编码">
+            <el-form-item label="表计编号">
               <el-input disabled :value="fillForm.deviceCode" />
             </el-form-item>
             <el-form-item label="上次抄表日期">
@@ -133,7 +133,7 @@
 
 <script>
 import { listDevice } from '@/api/device/meterDevice'
-import { listMeterReadingByParam, getLastRecord, addMeterReading, updateMeterReading, delMeterReading } from '@/api/device/meterRead'
+import { listMeterReadingByParam, getLastRecord, addMeterReading, updateMeterReading } from '@/api/device/meterRead'
 import { areaTreeSelect } from '@/api/basecfg/area'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -176,6 +176,7 @@ export default {
         pageSize: 10,
         areaCode: null,
         deviceCode: null,
+        deviceName: null,
         meterCls: 45
       },
       // 电表表单参数
@@ -301,7 +302,7 @@ export default {
     handleViewRec(row) {
       this.recListForm = this.$options.data().recListForm
       this.resetForm('recListForm')
-      this.title = '（' + this.getObjTypeName(row.objType) + '）' + row.objName
+      this.title = row.deviceName
       this.curRow = row
       this.recListForm.year = dateFormat(new Date(), 'yyyy')
       this.recListForm.deviceCode = row.deviceCode
@@ -322,7 +323,7 @@ export default {
     async handleRecord(row) {
       this.fillForm = this.$options.data().fillForm
       this.resetForm('fillForm')
-      this.fillTitle = '（' + this.getObjTypeName(row.objType) + '）' + row.objName
+      this.fillTitle = row.deviceName
       this.fillForm.deviceCode = row.deviceCode
       this.fillForm.areaCode = row.areaCode
       this.fillForm.magnification = row.magnification