设备检定功能

src/router/generator-platform-routers.js

@@ -60,6 +60,10 @@ const constantRouterComponents = {
   'SbInfo': () => import('@/views/sb/info/SbInfo'),
   // 测量设备基础信息
   'MeasureSbInfo': () => import('@/views/sb/info/MeasureSbInfo'),
+  // 测量设备基础信息-需要检定-外部检定的
+  'MeasureSbInfoCheck': () => import('@/views/sb/info/MeasureSbInfoCheck'),
+  // 测量设备基础信息-需要检定-自检的
+  'MeasureSbInfoCheckSelf': () => import('@/views/sb/info/MeasureSbInfoCheckSelf'),
   // 测量设备基础信息-不需要检定的
   'MeasureSbInfoNotCheck': () => import('@/views/sb/info/MeasureSbInfoNotCheck'),
   // 测量设备预警台账

src/views/sb/info/MeasureSbInfoCheck.vue

@@ -0,0 +1,17 @@
+<template>
+  <SbInfo :use-type="4" :is-measure="1" :is-self="0" />
+</template>
+
+<script>
+import SbInfo from './SbInfo'
+export default {
+  name: 'MeasureSbInfo',
+  components: {
+    SbInfo
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/sb/info/MeasureSbInfoCheckSelf.vue

@@ -0,0 +1,17 @@
+<template>
+  <SbInfo :use-type="4" :is-measure="1" :is-self="1"/>
+</template>
+
+<script>
+import SbInfo from './SbInfo'
+export default {
+  name: 'MeasureSbInfo',
+  components: {
+    SbInfo
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/sb/info/MeasureSbInfoNotCheck.vue

@@ -14,4 +14,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/views/sb/info/SbInfo.vue

@@ -19,12 +19,24 @@
                 <a-row :gutter="48">
                   <a-col :md="6" :sm="24">
                     <a-form-item label="关键字">
-                      <a-input v-model.trim="queryParam.keyword" placeholder="名称/设备编号"/>
+                      <a-input v-model.trim="queryParam.keyword" placeholder="设备编号"/>
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
-                    <a-form-item label="设备位号">
-                      <a-input v-model.trim="queryParam.positionNo" placeholder="设备位号"/>
+                    <a-form-item label="车间位置">
+                      <a-select v-model="queryParam.positionId" placeholder="请选择">
+                        <a-select-option
+                          v-for="({id,name}) in sbPositionData"
+                          :key="id"
+                          :label="name"
+                          :value="id">{{ name }}
+                        </a-select-option>
+                      </a-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="设备名称">
+                      <a-input v-model.trim="queryParam.name" placeholder="名称"/>
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
@@ -32,6 +44,16 @@
                       <a-input v-model.trim="queryParam.ppNo" placeholder="父位号"/>
                     </a-form-item>
                   </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="设备位号">
+                      <a-input v-model.trim="queryParam.positionNo" placeholder="设备位号"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="生产商">
+                      <a-input v-model.trim="queryParam.producerId" placeholder="生产商"/>
+                    </a-form-item>
+                  </a-col>
                   <!--                  <a-col :md="6" :sm="24">
                     <a-form-item label="设备自编号">
                       <a-input v-model="queryParam.zbh" placeholder="设备自编号"/>
@@ -49,7 +71,7 @@
                       </a-select>
                     </a-form-item>
                   </a-col>
-                  <a-col :md="6" :sm="24">
+<!--                  <a-col :md="6" :sm="24">
                     <a-form-item label="自定义类型">
                       <a-select v-model="queryParam.useType" placeholder="请选择">
                         <a-select-option
@@ -60,39 +82,20 @@
                         </a-select-option>
                       </a-select>
                     </a-form-item>
-                  </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="规格型号">
-                      <a-input v-model="queryParam.model" placeholder="规格型号"/>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="设备位置">
-                      <a-select v-model="queryParam.positionId" placeholder="请选择">
-                        <a-select-option
-                          v-for="({id,name}) in sbPositionData"
-                          :key="id"
-                          :label="name"
-                          :value="id">{{ name }}
-                        </a-select-option>
-                      </a-select>
+                  </a-col>-->
+                  <a-col :md="8" :sm="24">
+                    <a-form-item label="检定日期范围">
+                      <a-range-picker v-model="dateRangeCheck" :style="{width: '256px'}" />
                     </a-form-item>
                   </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="电力线路">
-                      <a-select v-model="queryParam.baoyangTimes" placeholder="请选择">
-                        <a-select-option
-                          v-for="(label,value) in lineMap"
-                          :key="value"
-                          :label="label"
-                          :value="parseInt(value)">{{ label }}
-                        </a-select-option>
-                      </a-select>
+                  <a-col :md="8" :sm="24">
+                    <a-form-item label="有效日期范围">
+                      <a-range-picker v-model="dateRange" :style="{width: '256px'}" />
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
-                    <a-form-item label="生产商">
-                      <a-input v-model="queryParam.producerId" placeholder="生产商名称"/>
+                    <a-form-item label="规格型号">
+                      <a-input v-model="queryParam.model" placeholder="规格型号"/>
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
@@ -131,14 +134,16 @@
                       </a-select>
                     </a-form-item>
                   </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="检定日期范围">
-                      <a-range-picker v-model="dateRangeCheck" :style="{width: '256px'}" />
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="8" :sm="24">
-                    <a-form-item label="有效日期范围">
-                      <a-range-picker v-model="dateRange" :style="{width: '256px'}" />
+                  <a-col :md="6" :sm="24">
+                    <a-form-item label="电力线路">
+                      <a-select v-model="queryParam.baoyangTimes" placeholder="请选择">
+                        <a-select-option
+                          v-for="(label,value) in lineMap"
+                          :key="value"
+                          :label="label"
+                          :value="parseInt(value)">{{ label }}
+                        </a-select-option>
+                      </a-select>
                     </a-form-item>
                   </a-col>
                   <a-col :md="6 || 24" :sm="24">
@@ -323,6 +328,10 @@ export default {
     isMeasure: {
       type: Number,
       default: null
+    },
+    isSelf: {
+      type: Number,
+      default: null
     }
   },
   data () {