手动抄表

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

@@ -29,11 +29,16 @@
         </el-form>
         <el-table v-loading="loading" :data="deviceList">
           <el-table-column label="计量对象" align="left" prop="objName" width="300px">
-            <!-- <template slot-scope="scope">
-                  <span>{{ "（" + getObjTypeName(scope.row.objType) + "）"+ scope.row.objName }}</span>
-                </template> -->
+             <template slot-scope="scope">
+               <span>{{ "（" + getObjTypeName(scope.row.objType) + "）"+ scope.row.objName }}</span>
+             </template>
           </el-table-column>
           <el-table-column label="设备代码" align="center" prop="deviceCode" />
+          <el-table-column label="计量标签" align="center" prop="objTag" >
+            <template slot-scope="scope">
+              <span>{{ getObjTagName(scope.row.objTag) }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="抄表周期" align="center" prop="colCycle">
             <template slot-scope="scope">
               <span>{{ getColCycleName(scope.row.colCycle) }}</span>
@@ -51,23 +56,24 @@
           @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-input :value="fillForm.currentMonth" />
-            </el-form-item>
             <el-form-item label="上次抄表日期">
               <el-input disabled :value="fillForm.lastTime" />
             </el-form-item>
             <el-form-item label="上次抄表示数">
               <el-input disabled :value="fillForm.lastReading" />
             </el-form-item>
+
+            <el-form-item label="抄表日期">
+              <el-input :value="fillForm.currentMonth" />
+            </el-form-item>
             <el-form-item required :rules="[{required:true,message:'请输入本次抄表示数'}]" label="本次抄表示数" prop="meterReading">
               <el-input v-model="fillForm.meterReading" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入本次抄表示数" />
             </el-form-item>
             <el-form-item label="综合倍率" prop="magnification">
-              <el-input v-model="fillForm.magnification" />
+              <el-input disabled :value="fillForm.magnification" />
             </el-form-item>
             <el-form-item :label="`参考增量(${activeTab==='first'?'度':'吨'})`">
-              <el-input :value="increase" />
+              <el-input disabled :value="increase" />
             </el-form-item>
 
           </el-form>
@@ -79,6 +85,9 @@
         <!-- 历史抄表记录 -->
         <el-dialog :title="title" :visible.sync="recListOpen" width="1200px" append-to-body>
           <el-form ref="recListForm" :model="recListForm" label-width="80px">
+            <el-form-item label="年份" prop="year">
+              <el-input size="mini" v-model="recListForm.year" placeholder="年份" />
+            </el-form-item>
             <el-form-item label="抄表历史" prop="recList">
               <el-table v-loading="loading" :data="recListForm.recList" max-height="280px">
                 <el-table-column label="设备代码" align="center" prop="deviceCode" />
@@ -87,6 +96,11 @@
                 <el-table-column label="抄表日期" align="center" prop="meterTime" />
                 <el-table-column label="抄表示数" align="center" prop="meterReading" />
                 <el-table-column label="用量" align="center" prop="increase" />
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" @click="">修改</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>
@@ -188,7 +202,6 @@ export default {
         this.loading = false
       })
     },
-
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -227,6 +240,13 @@ export default {
       }
       return cycleMap[colCycle] || ''
     },
+    getObjTagName(objTag) {
+      const tagMap = {
+        0: '公摊表',
+        1: '个户表'
+      }
+      return tagMap[objTag] || '未知'
+    },
     /** 查询区域树结构 */
     getAreaTree(tier) {
       areaTreeSelect(tier).then(response => {