完善

src/api/sb/measure.js

@@ -339,6 +339,23 @@ export function exportSbInfoMeasure (parameter) {
   })
 }
 
+/**
+ * export file
+ * parameter: { }
+ * @param parameter :
+  * @returns {*}
+ */
+export function exportSbInfoMeasureTwo (parameter) {
+  return axios({
+    url: '/sb/info/measures/export/measure?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    responseType: 'blob'
+  })
+}
+
 /**
  * query list func
  * parameter: { }

src/views/sb/measure/MeasureSbInfo.vue

@@ -32,7 +32,7 @@
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="关联状态">
+                  <a-form-item label="管理状态">
                     <a-select v-model="queryParam.status" placeholder="请选择">
                       <a-select-option
                         v-for="(label,value) in statusMap"
@@ -63,6 +63,7 @@
             <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="upload" @click="doImport">新增导入</a-button>
             <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="upload" @click="doImportForUpdate">修改导入</a-button>
             <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="download" @click="doExport">导出</a-button>
+            <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="download" @click="doExportMeasure">检定导出</a-button>
             <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-infos-del')">
               <a-menu slot="overlay">
                 <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
@@ -130,7 +131,13 @@ import BaseForm from './modules/BaseForm'
 import Detail from './modules/Detail'
 import DownloadModal from '@/views/download/DownloadModal'
 import PreviewModal from '@/views/preview/PreviewModal'
-import { getSbInfoPage, deleteSbInfos, fetchSbInfo, exportSbInfoMeasure } from '@/api/sb/measure'
+import {
+  getSbInfoPage,
+  deleteSbInfos,
+  fetchSbInfo,
+  exportSbInfoMeasure,
+  exportSbInfoMeasureTwo
+} from '@/api/sb/measure'
 import { fetchSbTypeTree } from '@/api/sb/type'
 import ImportFormAdd from './modules/ImportFormAdd'
 import ImportFormUpdate from './modules/ImportFormUpdate'
@@ -506,6 +513,20 @@ export default {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },
+    doExportMeasure () {
+      if (this.dateRange != null) {
+        this.queryParam.nextCheckDateStart = this.dateRange[0]
+        this.queryParam.nextCheckDateEnd = this.dateRange[1]
+        this.queryParam.nextCheckDateStart = this.queryParam.nextCheckDateStart ? this.queryParam.nextCheckDateStart.format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
+        this.queryParam.nextCheckDateEnd = this.queryParam.nextCheckDateEnd ? this.queryParam.nextCheckDateEnd.format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN) : null
+      }
+      const parameter = {
+        ...this.queryParam
+      }
+      exportSbInfoMeasureTwo(parameter).then(file => {
+        this.BaseTool.UPLOAD.downLoadExportExcel(file)
+      })
+    },
     setTree (record = {}) {
       fetchSbTypeTree().then(res => {
         this.treeData = res.data

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

@@ -114,7 +114,7 @@
 
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="状态"
+            label="管理状态"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >

src/views/sb/measure/modules/Detail.vue

@@ -33,7 +33,7 @@
         <detail-list-item term="预警天数">{{ model.seatNumber }}</detail-list-item>
         <detail-list-item term="是否固定资产">{{ model.isFinancing }}</detail-list-item>
         <detail-list-item term="资产编号">{{ model.financingNo }}</detail-list-item>
-        <detail-list-item term="状态">{{ BaseTool.Object.getField(statusMap,model.status) }}</detail-list-item>
+        <detail-list-item term="管理状态">{{ BaseTool.Object.getField(statusMap,model.status) }}</detail-list-item>
         <detail-list-item term="检定校准记录">{{ model.zbh }}</detail-list-item>
         <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
       </detail-list>

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

@@ -101,6 +101,22 @@
               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-select v-decorator="['sbStatus', {rules: [{required: true, message: '管理状态不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in statusMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
       </row-list>
       <row-list :col="2">
         <row-item>
@@ -173,11 +189,7 @@ export default {
       form: this.$form.createForm(this),
       visible: false,
       // 下拉框map
-      typeMap: {},
-      actionTypeMap: {},
-      paramTypeMap: {},
-      enableMap: {},
-      periodTypeMap: {},
+      statusMap: {},
       checkImgList: [], // 图片
       checkFileList: [], // 文档
       defaultCheckImgList: [],
@@ -196,11 +208,7 @@ export default {
   },
   created () {
     // 下拉框map
-    this.paramTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_STANDARD_PARAM_TYPE)
-    this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_STANDARD_TYPE)
-    this.periodTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
-    this.actionTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_ACTION_TYPE)
-    this.enableMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_MEASURE_STATUS)
   },
   methods: {
     base (record, sbInfo) {
@@ -217,7 +225,7 @@ export default {
           const { form: { setFieldsValue } } = this
           // 日期处理
           this.$nextTick(() => {
-            setFieldsValue({ sbId: sbInfo.id, cardNo: sbInfo.cardNo, sbModel: sbInfo.model, sbName: sbInfo.name, checkPeriod: sbInfo.checkPeriod })
+            setFieldsValue({ sbId: sbInfo.id, cardNo: sbInfo.cardNo, sbStatus: sbInfo.status, sbModel: sbInfo.model, sbName: sbInfo.name, checkPeriod: sbInfo.checkPeriod })
           })
         }
         return
@@ -248,6 +256,7 @@ export default {
           'no',
           'type',
           'period',
+          'sbStatus',
           'sbName',
           'sbModel',
           'sbNo',

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

@@ -11,12 +11,14 @@
     <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.seatNumber }}天</detail-list-item>
+      <detail-list-item term="管理状态">{{ BaseTool.Object.getField(statusMap,model.status) }}</detail-list-item>
     </detail-list>
     <title-divider title="检定信息" width="90px"></title-divider>
     <div class="table-operator">
@@ -92,7 +94,7 @@ export default {
       modalTitle: null,
       visible: false,
       typeMap: {},
-      actionTypeMap: {},
+      statusMap: {},
       // 表头
       columns: [
         {
@@ -133,7 +135,7 @@ export default {
   created () {
     // 下拉框map
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_STANDARD_TYPE)
-    this.periodTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_MEASURE_STATUS)
     this.actionTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_ACTION_TYPE)
   },
   methods: {
@@ -209,8 +211,8 @@ export default {
       exportCheckStandard(parameter).then(file => {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
-    },
-    handleSbSelect () {
+    }
+    /* handleSbSelect () {
       this.$refs.sbInfoSelectModal.base()
     },
     handleSbSelectd (keys, rows) {
@@ -224,7 +226,7 @@ export default {
         }).catch(() => {
           this.confirmLoading = false
         })
-    }
+    } */
   }
 }
 </script>