Merge remote-tracking branch 'origin/master'

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

@@ -142,17 +142,14 @@
                 <el-option v-for="item in areaOptions" :label="item.label" :value="item.id" :key="item.id" />
               </el-select>
             </el-form-item>
-
             <el-form-item label="计量类别" prop="meterCls">
               <el-select v-model="form.meterCls" >
                 <el-option v-for="item in emsClsOptions" :label="item.name" :value="item.code" :key="item.code" />
               </el-select>
             </el-form-item>
-
             <el-form-item label="设备代码" prop="deviceCode">
               <el-input v-model="form.deviceCode" placeholder="请输入设备代码" />
             </el-form-item>
-
             <el-form-item label="计量分类" prop="objType">
               <el-select v-model="form.objType" @change="changeObjOptions">
                 <el-option v-for="item in objTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
@@ -161,6 +158,12 @@
             <el-form-item label="计量对象" prop="objCode">
               <treeselect v-model="objCode" :options="objCodeOptions" :show-count="true" placeholder="请选择计量对象" ref="treeObjCodeOptions"/>
             </el-form-item>
+            <el-form-item label="计量标签" prop="objTag">
+              <el-radio-group v-model="form.objTag" size="medium">
+                <el-radio v-for="(item, index) in objTagOptions" :key="index" :label="item.code"
+                          :disabled="item.disabled">{{item.name}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
             <el-form-item label="采集方式" prop="colMode">
               <el-select v-model="form.colMode" >
                 <el-option v-for="item in colModeOptions" :label="item.name" :value="item.code" :key="item.code" />
@@ -239,12 +242,17 @@ export default {
         {"code": 1, "name": "区块"},
         {"code": 2, "name": "设备"}
       ],
+      objTagOptions: [
+        {"code": 0, "name": "公摊表"},
+        {"code": 1, "name": "个户表"}
+      ],
       colCycleOptions: [
         {"code": 0, "name": "实时"},
         {"code": 1, "name": "分钟"},
         {"code": 2, "name": "小时"},
         {"code": 3, "name": "天"},
-        {"code": 4, "name": "月"}
+        {"code": 4, "name": "月"},
+        {"code": 5, "name": "双月"},
       ],
       colModeOptions: [
         {"code": 0, "name": "自动抄表"},
@@ -261,6 +269,7 @@ export default {
         objType: null,
         objCode: null,
         objName: null,
+        objTag: null,
         colCycle: null,
         colMode: null,
         magnification: null,
@@ -451,7 +460,8 @@ export default {
         1: '分钟',
         2: '小时',
         3: '天',
-        4: '月'
+        4: '月',
+        5: '双月'
       };
       return cycleMap[colCycle] || '';
     },