Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

# Conflicts:
#	ems-ui/src/views/devmgr/meterRead/index.vue

ems-ui/src/views/basecfg/meterdevc/index.vue

@@ -50,7 +50,7 @@
               <span>{{ "（" + getObjTypeName(scope.row.objType) + "）"+ scope.row.objName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="计量标签" align="center" prop="objTag" >
+          <el-table-column label="计量标签" align="center" prop="objTag">
             <template slot-scope="scope">
               {{formatDict(scope.row.objTag,'objTagOptions')}}
             </template>
@@ -116,12 +116,12 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="采集方式" prop="colMode">
-              <el-select v-model="form.colMode">
+              <el-select v-model="form.colMode" @change="colModeChange">
                 <el-option v-for="item in colModeOptions" :label="item.name" :value="item.code" :key="item.code" />
               </el-select>
             </el-form-item>
-            <el-form-item label="采集周期" prop="colCycle" v-if="form.colMode === 0">
-              <el-select v-model="form.colCycle">
+            <el-form-item label="采集周期" prop="colCycle">
+              <el-select v-model="form.colCycle" :disabled="form.colMode === 1">
                 <el-option v-for="item in colCycleOptions" :label="item.name" :value="item.code" :key="item.code" />
               </el-select>
             </el-form-item>
@@ -273,6 +273,13 @@ export default {
     this.getList()
   },
   methods: {
+    colModeChange(val) {
+      if (val === 1) {
+        this.form.colCycle = 4
+      } else {
+        this.form.colCycle = null
+      }
+    },
     /** 查询计量设备列表 */
     getList() {
       this.loading = true

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

@@ -44,6 +44,8 @@
               <span>{{ getColCycleName(scope.row.colCycle) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="上次抄表日期" align="center" prop="lastTime" />
+          <el-table-column label="上次抄表示数" align="center" prop="lastReading" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text" icon="el-icon-info" @click="handleRecord(scope.row)">
@@ -113,14 +115,8 @@
                 <el-table-column label="抄表日期" align="center" prop="meterTime" />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                   <template slot-scope="scope">
-                    <el-button
-                      type="success"
-                      plain
-                      icon="el-icon-edit"
-                      size="mini"
-                      :disabled= "!canEdit(scope.row.meterMonth)"
-                      @click="updateRecord(scope.row)"
-                    >修改</el-button>
+                    <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="!canEdit(scope.row.meterMonth)"
+                      @click="updateRecord(scope.row)">修改</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -223,9 +219,23 @@ export default {
     getList() {
       this.loading = true
       listDevice(this.queryParams).then(response => {
-        this.deviceList = response.rows
+        this.deviceList = response.rows.map(item=>({
+          ...item,
+          meterMonth:'',
+          lastTime:'',
+          lastReading:'',
+        }))
         this.total = response.total
         this.loading = false
+        this.deviceList.forEach(async item => {
+          await getLastRecord(item.areaCode, item.deviceCode).then(({ data }) => {
+            if (data) {
+              item.lastTime = data.meterTime
+              item.meterMonth = data.meterMonth
+              item.lastReading = data.meterReading
+            }
+          })
+        })
       })
     },
     /** 搜索按钮操作 */
@@ -292,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 = '（' + this.getObjTypeName(row.objType) + '）' + row.objName
       this.curRow = row
       this.recListForm.year = dateFormat(new Date(), 'yyyy')
       this.recListForm.deviceCode = row.deviceCode
@@ -305,7 +315,7 @@ export default {
         areaCode,
         deviceCode,
         year: this.recListForm.year,
-        orderFlag:'desc'
+        orderFlag: 'desc'
       }).then(response => {
         this.recListForm.recList = response.data || []
       })
@@ -313,31 +323,33 @@ export default {
     async handleRecord(row) {
       this.fillForm = this.$options.data().fillForm
       this.resetForm('fillForm')
-      this.fillTitle = "（" + this.getObjTypeName(row.objType) + "）"+ row.objName
+      this.fillTitle = '（' + this.getObjTypeName(row.objType) + '）' + row.objName
       this.fillForm.deviceCode = row.deviceCode
       this.fillForm.areaCode = row.areaCode
       this.fillForm.magnification = row.magnification
+      this.fillForm.lastTime = row.lastTime
+      this.fillForm.lastReading = row.lastReading
       this.ifAdd = true
-      let existFlag = false
-      // 获取上次填报记录
-      await getLastRecord(row.areaCode, row.deviceCode).then(({ data }) => {
-        if (data) {
-          if (data.meterMonth === this.currentMonth) {
-            existFlag = true
-          } else {
-            this.fillForm.lastTime = data.meterTime
-            this.fillForm.lastReading = data.meterReading
-          }
-        }
-      })
-      if (!existFlag) {
+      // let existFlag = false
+      // // 获取上次填报记录
+      // await getLastRecord(row.areaCode, row.deviceCode).then(({ data }) => {
+      //   if (data) {
+      //     if (data.meterMonth === this.currentMonth) {
+      //       existFlag = true
+      //     } else {
+      //       this.fillForm.lastTime = data.meterTime
+      //       this.fillForm.lastReading = data.meterReading
+      //     }
+      //   }
+      // })
+      // if (row.meterMonth===this.currentMonth) {
+      //   this.$modal.msgError('当前月份已填报')
+      // } else {
         this.fillFormOpen = true
-      } else {
-        this.$modal.msgError('当前月份已填报')
-      }
+      // }
     },
     canEdit(meterMonth) {
-      return meterMonth === this.currentMonth;
+      return meterMonth === this.currentMonth
     },
     updateRecord(row) {
       this.ifAdd = false