完善计量的功能

src/views/sb/info/MeasureSbInfoWarn.vue

@@ -190,13 +190,13 @@ export default {
                   dataIndex: 'zbh',
                   width: 120,
                   checked: true
-                },*/
+                },
         {
           title: '计量设备编号',
           dataIndex: 'cardNo',
           width: 150,
           checked: true
-        },
+        },*/
         {
           title: '设备名称',
           checked: true,

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

@@ -221,15 +221,6 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-          <a-form-item
-            label="生产商"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-            v-show="false"
-          >
-            <a-input
-              v-decorator="['producerId', {rules: [{required: true, message: '生产商不能为空'}]}]" />
-          </a-form-item>
         </a-col>
       </a-row>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
@@ -661,7 +652,7 @@
       </div>
       <title-divider v-show="useType == 4" title="计量信息" width="90px"></title-divider>
       <div v-show="useType == 4" >
-        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+<!--        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
           <a-col :lg="12" :md="24" :sm="24">
             <a-form-item
               label="计量设备编号"
@@ -750,22 +741,8 @@
                 v-decorator="['sbdh']" />
             </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-number
-                style="width: 100%"
-                :min="0"
-                :step="0.01"
-                :formatter="BaseTool.Amount.formatter"
-                :parser="BaseTool.Amount.parser"
-                v-decorator="['seatNumber']" />
-            </a-form-item>
-          </a-col>
-        </a-row>
+
+        </a-row>-->
         <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
           <a-col :lg="12" :md="24" :sm="24">
             <a-form-item
@@ -807,6 +784,21 @@
                 v-decorator="['nextCheckDate']" />
             </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-number
+                style="width: 100%"
+                :min="30"
+                :step="1"
+                :formatter="BaseTool.Amount.formatter"
+                :parser="BaseTool.Amount.parser"
+                v-decorator="['seatNumber']" />
+            </a-form-item>
+          </a-col>
         </a-row>
       </div>
       <title-divider title="文件信息" width="90px"></title-divider>

src/views/sb/measurelog/MeasureLog.vue

@@ -5,7 +5,7 @@
         <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">
@@ -141,25 +141,17 @@ export default {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
-        {
-          title: '计量设备编号',
-          dataIndex: 'cardNo'
-        },
         {
           title: '设备名称',
           dataIndex: 'sbName'
         },
         {
-          title: '设备型号',
-          dataIndex: 'sbModel'
-        },
-        {
-          title: '出厂编号',
-          dataIndex: 'sbZzh'
+          title: '设备编号',
+          dataIndex: 'sbNo'
         },
         {
-          title: '设备新号',
-          dataIndex: 'sbNo'
+          title: '设备型号',
+          dataIndex: 'sbModel'
         },
         {
           title: '检定日期',

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

@@ -14,19 +14,6 @@
       </a-form-item>
 
       <row-list :col="2">
-        <row-item>
-          <a-form-item
-            label="计量设备编号"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              disabled
-              style="width: 80%"
-              v-decorator="['cardNo']"/>
-            <a-button type="primary" style="width: 20%" @click="handleSbSelect">选择</a-button>
-          </a-form-item>
-        </row-item>
         <row-item>
           <a-form-item
             label="检定设备名称"
@@ -103,7 +90,7 @@
               v-decorator="['requirement', {rules: [{required: false, message: '备注不能为空'}]}]"/>
           </a-form-item>
         </row-item>
-        <row-item>
+        <!--        <row-item>
           <a-form-item
             label="准确度等级"
             :labelCol="BaseTool.Constant.labelCol"
@@ -113,7 +100,7 @@
               disabled
               v-decorator="['fdjxh']" />
           </a-form-item>
-        </row-item>
+        </row-item>-->
         <row-item>
           <a-form-item
             label="备注"
@@ -124,7 +111,7 @@
               v-decorator="['remark']" />
           </a-form-item>
         </row-item>
-        <row-item>
+        <!--        <row-item>
           <a-form-item
             label="管理状态"
             :labelCol="BaseTool.Constant.labelCol"
@@ -139,7 +126,7 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </row-item>
+        </row-item>-->
       </row-list>
       <row-list :col="2">
         <row-item>
@@ -228,6 +215,10 @@ export default {
     }
   },
   props: {
+    type: {
+      type: Number,
+      default: 1
+    }
   },
   created () {
     // 下拉框map
@@ -308,6 +299,7 @@ export default {
           this.confirmLoading = false
           return
         }
+        values.type = this.type
         values.paramList = this.data
         // 上传文件
         values.checkImgList = this.checkImgList

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

@@ -9,19 +9,17 @@
     </a-row>
     <title-divider title="设备信息" width="90px"></title-divider>
     <detail-list title="" :col="3">
-      <detail-list-item term="检测设备编号">{{ model.cardNo }}</detail-list-item>
-      <detail-list-item term="设备新号">{{ model.no }}</detail-list-item>
       <detail-list-item term="设备新号">{{ model.no }}</detail-list-item>
       <detail-list-item term="设备型号">{{ model.model }}</detail-list-item>
       <detail-list-item term="设备名称">{{ model.name }}</detail-list-item>
       <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.fdjxh }}</detail-list-item>-->
       <detail-list-item term="预警天数">{{ model.seatNumber }}天</detail-list-item>
-      <detail-list-item term="管理状态"> <badge
+<!--      <detail-list-item term="管理状态"> <badge
         :status="DictCache.COLOR.SB_MEASURE_STATUS[model.status]"
-        :text="statusMap[model.status]" /></detail-list-item>
+        :text="statusMap[model.status]" /></detail-list-item>-->
     </detail-list>
     <title-divider title="检定信息" width="90px"></title-divider>
     <div class="table-operator" style="margin-bottom: 8px;">
@@ -47,7 +45,7 @@
         </template>
       </span>
     </a-table>
-    <base-form ref="baseModal" @ok="handleOk"/>
+    <base-form ref="baseModal" :type="1" @ok="handleOk"/>
     <base-form-insert ref="baseModalInsert" @ok="handleOk"/>
     <detail ref="detailModal"/>