Merge remote-tracking branch 'origin/dev' into dev

pages/meter-contract/contract-register/MeterContractRegisterEdit.vue

@@ -90,8 +90,8 @@
                   <el-input v-model="scope.row.manufacturer" blur placeholder="请输入生产厂家"
                   ></el-input>
                 </div>
-                <div v-else-if="item.key==='type'" @click.stop="_handleRow(scope)">
-                  <Select v-model="scope.row.type">
+                <div v-else-if="item.key==='aptituded'" @click.stop="_handleRow(scope)">
+                  <Select v-model="scope.row.aptituded">
                     <Option v-for="(item,index) in options" :key="item.name" :value="index">
                       {{ item.name }}
                     </Option>
@@ -186,13 +186,10 @@ export default {
       ],
       options: [
         {
-          name: '检定'
+          name: '否'
         },
         {
-          name: '校准'
-        },
-        {
-          name: '外观检查'
+          name: '是'
         }
       ],
       btn: [