完善

src/utils/dict.js

@@ -548,6 +548,7 @@ DictCache.VALUE = {
     IN_USE: 2, // 使用中
     IN_SCRAP: 3, // 报废中
     SCRAPED: 4, // 已报废
+    REFUSE_SCRAPED: 41, // 报废拒绝
     IN_REPLACEMENT: 5, // 置换中
     REPLACEMENTED: 6, // 已置换
     IN_STOP: 7, // 停用中

src/views/sb/info/modules/BaseFormMeasureRelation.vue

@@ -219,7 +219,7 @@
               :wrapperCol="BaseTool.Constant.wrapperCol"
             >
               <a-input
-                v-decorator="['guigeId', {rules: [{required: true, message: '请填写原计量系统主键'}]}]" />
+                v-decorator="['guigeId']" />
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="24" :sm="24">
@@ -229,17 +229,7 @@
               :wrapperCol="BaseTool.Constant.wrapperCol"
             >
               <a-input
-                v-decorator="['cardNo', {rules: [{required: true, message: '请选择关联设备'}]}]" />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="24" :sm="24">
-            <a-form-item
-              label="准确度等级"
-              :labelCol="BaseTool.Constant.labelCol"
-              :wrapperCol="BaseTool.Constant.wrapperCol"
-            >
-              <a-input
-                v-decorator="['fdjxh', {rules: [{required: true, message: '请填写准确度等级'}]}]" />
+                v-decorator="['cardNo']" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -320,6 +310,7 @@
                 style="width: 100%"
                 :min="0"
                 :step="0.01"
+                suffix="天"
                 :formatter="BaseTool.Amount.formatter"
                 :parser="BaseTool.Amount.parser"
                 v-decorator="['seatNumber', {rules: [{required: true, message: '请填写预警天数'}]}]" />
@@ -367,6 +358,16 @@
                 v-decorator="['nextCheckDate', {rules: [{required: true, message: '请填写检定有效期'}]}]" />
             </a-form-item>
           </a-col>
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="准确度等级"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol"
+            >
+              <a-input
+                v-decorator="['fdjxh']" />
+            </a-form-item>
+          </a-col>
         </a-row>
       </div>
 <!--      <title-divider title="文件信息" width="90px"></title-divider>