完善

src/components/custom/Badge.vue

@@ -41,6 +41,9 @@ export default {
       if (this.status === 'warning') {
         myShowStyle = { ...myShowStyle, ...{ backgroundColor: '#faad14' } }
       }
+      if (this.status === 'gray') {
+        myShowStyle = { ...myShowStyle, ...{ backgroundColor: '#7F7D77FF' } }
+      }
       myShowStyle = { ...myShowStyle, ...this.numberStyle }
       return myShowStyle
     }

src/utils/dict.js

@@ -1217,6 +1217,18 @@ DictCache.COLOR = {
     7: 'error', // 停用中
     8: 'error' // 维修中
   },
+  /**
+   * 计量设备状态
+   */
+  SB_MEASURE_STATUS: {
+    1: 'success', // 在用
+    2: 'warning', // 检定
+    3: 'gray', // 备用
+    4: 'error', // 维修
+    5: 'gray', // 停用
+    6: 'gray', // 丢失
+    7: 'gray' // 转出
+  },
   /**
    * 改进措施状态
    */

src/views/sb/measure/MeasureSbInfo.vue

@@ -117,7 +117,7 @@
             </span>
             <span slot="status" slot-scope="text">
               <badge
-                :status="DictCache.COLOR.SB_INFO_STATUS[text]"
+                :status="DictCache.COLOR.SB_MEASURE_STATUS[text]"
                 :text="statusMap[text]" />
             </span>
           </s-table>

src/views/sb/measurelog/modules/BaseForm.vue

@@ -103,6 +103,27 @@
               v-decorator="['requirement', {rules: [{required: false, message: '备注不能为空'}]}]"/>
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="准确度等级"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              disabled
+              v-decorator="['fdjxh']" />
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="备注"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['remark']" />
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="管理状态"
@@ -227,7 +248,7 @@ export default {
           const { form: { setFieldsValue } } = this
           // 日期处理
           this.$nextTick(() => {
-            setFieldsValue({ sbId: sbInfo.id, cardNo: sbInfo.cardNo, sbStatus: sbInfo.status, sbModel: sbInfo.model, sbName: sbInfo.name, checkPeriod: sbInfo.checkPeriod })
+            setFieldsValue({ sbId: sbInfo.id, fdjxh: sbInfo.fdjxh, cardNo: sbInfo.cardNo, sbStatus: sbInfo.status, sbModel: sbInfo.model, sbName: sbInfo.name, checkPeriod: sbInfo.checkPeriod })
           })
         }
         return
@@ -271,6 +292,7 @@ export default {
           'actionType',
           'enable',
           'requirement',
+          'fdjxh',
           'remark'
         ])))
       })

src/views/sb/measurelog/modules/DetailSbCheck.vue

@@ -17,8 +17,11 @@
       <detail-list-item term="检定日期">{{ model.checkDate }}</detail-list-item>
       <detail-list-item term="检定周期">{{ model.checkPeriod }}个月</detail-list-item>
       <detail-list-item term="检定有效期">{{ model.nextCheckDate }}</detail-list-item>
+      <detail-list-item term="准确度等级">{{ model.fdjxh }}</detail-list-item>
       <detail-list-item term="预警天数">{{ model.seatNumber }}天</detail-list-item>
-      <detail-list-item term="管理状态">{{ BaseTool.Object.getField(statusMap,model.status) }}</detail-list-item>
+      <detail-list-item term="管理状态"> <badge
+        :status="DictCache.COLOR.SB_MEASURE_STATUS[model.status]"
+        :text="statusMap[model.status]" /></detail-list-item>
     </detail-list>
     <title-divider title="检定信息" width="90px"></title-divider>
     <div class="table-operator">