完善

src/router/generator-platform-routers.js

@@ -78,7 +78,7 @@ const constantRouterComponents = {
   // 测量设备基础信息
   'MeasureSbInfo': () => import('@/views/sb/measure/MeasureSbInfo'),
   // 测量设备预警台账
-  'MeasureSbInfoWarn': () => import('@/views/sb/info/MeasureSbInfoWarn'),
+  'MeasureSbInfoWarn': () => import('@/views/sb/measure/MeasureSbInfoWarn'),
   // 测量设备-检定记录
   'MeasureLog': () => import('@/views/sb/measurelog/MeasureLog'),
   // 特种设备基础信息

src/views/sb/measure/MeasureSbInfo.vue

@@ -162,24 +162,12 @@ export default {
         {
           title: '序号',
           dataIndex: 'index',
-          width: 50,
+          width: 120,
           checked: true,
           customRender: (text, record, index) => {
             return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
           }
         },
-        {
-          title: '设备新号',
-          dataIndex: 'no',
-          width: 120,
-          checked: true
-        },
-        /*        {
-          title: '设备旧号',
-          dataIndex: 'zbh',
-          width: 120,
-          checked: true
-        }, */
         {
           title: '测量设备编号',
           dataIndex: 'cardNo',
@@ -193,17 +181,24 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: '设备型号',
+          title: '出厂编号',
           checked: true,
           width: 200,
-          dataIndex: 'model'
+          dataIndex: 'zzh'
         },
         {
-          title: '使用位置',
+          title: '规格型号',
           checked: true,
           width: 200,
-          dataIndex: 'cph'
+          dataIndex: 'model'
         },
+        {
+          title: '要求准确度等级',
+          dataIndex: 'zz',
+          width: 150,
+          checked: true
+        },
+
         {
           title: '使用部门',
           checked: true,
@@ -211,68 +206,123 @@ export default {
           dataIndex: 'saveUserName'
         },
         {
-          title: '设备类型',
+          title: '使用地点',
           checked: true,
-          dataIndex: 'type',
-          width: 120,
+          width: 200,
+          dataIndex: 'cph'
+        },
+        {
+          title: '准确度等级',
+          checked: true,
+          width: 200,
+          dataIndex: 'fdjxh'
+        },
+        {
+          title: '检定日期',
+          checked: true,
+          width: 200,
+          dataIndex: 'checkDate'
+        },
+        {
+          title: '检定周期',
+          checked: true,
+          width: 200,
+          dataIndex: 'checkPeriod',
           customRender: (text, record, index) => {
-            return record.typeName
+            if (record.checkPeriod == null) {
+              return '未知'
+            } else {
+              return text + '月'
+            }
           }
         },
         {
-          title: '设备等级',
+          title: '有效日期',
+          dataIndex: 'nextCheckDate',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '生产厂商',
+          dataIndex: 'producerId',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '检定单位',
+          dataIndex: 'dph',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '检定人',
+          dataIndex: 'zaiz',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '检定结论',
+          dataIndex: 'rlType',
+          width: 150,
           checked: true,
-          dataIndex: 'level',
-          width: 120,
           customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.levelMap, text)
+            return this.BaseTool.Object.getField(this.measureMap, text)
           }
         },
-
         {
-          title: '设备原值',
-          dataIndex: 'initialValue',
-          width: 100,
+          title: '是否周检',
+          dataIndex: 'color',
+          width: 150,
+          checked: true,
           customRender: (text, record, index) => {
-            return this.BaseTool.Amount.formatter(text)
+            if (text === 0) {
+              return '否'
+            } else {
+              return '是'
+            }
           }
         },
         {
-          title: '购置日期',
-          dataIndex: 'buyDate',
-          width: 120,
+          title: '检定证书编号',
+          dataIndex: 'sbdh',
+          width: 150,
           checked: true
         },
         {
-          title: '投用日期',
-          dataIndex: 'startDate',
-          width: 120,
+          title: '检定校准记录',
+          dataIndex: 'zbh',
+          width: 150,
           checked: true
         },
         {
-          title: '检定日期',
-          dataIndex: 'checkDate',
+          title: '预警天数',
+          dataIndex: 'seatNumber',
           width: 150,
           checked: true
         },
         {
-          title: '检定周期',
-          dataIndex: 'checkPeriod',
-          width: 100,
+          title: '是否固定资产',
+          dataIndex: 'isFinancing',
+          width: 150,
           checked: true,
           customRender: (text, record, index) => {
-            if (record.nextCheckDate == null) {
-              return '未知'
+            if (text === 0) {
+              return '否'
             } else {
-              return text + '月'
+              return '是'
             }
           }
         },
         {
-          title: '检定有效期',
-          dataIndex: 'nextCheckDate',
+          title: '固定资产编号',
+          dataIndex: 'financingNo',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '设备新号',
+          dataIndex: 'no',
           width: 150,
-          fixed: 'right',
           checked: true
         },
         {
@@ -290,7 +340,7 @@ export default {
           }
         },
         {
-          title: '状态',
+          title: '管理状态',
           checked: true,
           dataIndex: 'status',
           width: 100,
@@ -426,6 +476,7 @@ export default {
       this.queryParam = {
         filter: this.filter
       }
+      this.dateRange = []
       this.visible = true
       this.$refs.table.refresh(true)
     },

src/views/sb/measure/MeasureSbInfoWarn.vue

@@ -0,0 +1,512 @@
+<template>
+  <a-card :bordered="false">
+    <a-row :gutter="8" v-show="visible">
+      <a-col :span="24">
+        <div>
+          <div class="table-page-search-wrapper">
+            <a-form layout="inline">
+              <a-row :gutter="48">
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="关键字">
+                    <a-input v-model="queryParam.keyword" placeholder="请输入名称"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="设备新号">
+                    <a-input v-model="queryParam.no"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="测量设备编号">
+                    <a-input v-model="queryParam.cardNo" />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="使用部门">
+                    <a-input v-model="queryParam.useDept" />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="出厂编号">
+                    <a-input v-model="queryParam.zzh"/>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="10" :sm="24">
+                  <a-form-item label="有效日期">
+                    <a-range-picker v-model="dateRange" :style="{width: '256px'}" />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6 || 24" :sm="24">
+                  <span class="table-page-search-submitButtons">
+                    <a-button type="primary" @click="handleOk()">查询</a-button>
+                    <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
+                  </span>
+                </a-col>
+              </a-row>
+            </a-form>
+          </div>
+
+          <div class="table-operator">
+            <a-button v-if="$auth('sb-infos-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>
+            <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-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-infos-del')">
+              <a-menu slot="overlay">
+                <a-popconfirm title="是否要删除所选数据？" @confirm="batchDelete()">
+                  <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
+                </a-popconfirm>
+              </a-menu>
+              <a-button style="margin-left: 8px">
+                批量操作 <a-icon type="down" />
+              </a-button>
+            </a-dropdown>
+          </div>
+
+          <s-table
+            ref="table"
+            size="default"
+            rowKey="id"
+            :widthSpace="true"
+            :columns="columns"
+            :data="loadData"
+            :alert="options.alert"
+            :rowSelection="options.rowSelection"
+            :scroll="{x: 1500, y: BaseTool.Constant.scrollY}"
+            showPagination="auto"
+          >
+            <span slot="action" slot-scope="record">
+              <template>
+                <div>
+                  <a-dropdown>
+                    <a-menu slot="overlay">
+                      <a-menu-item key="0">
+                        <a @click="handleView(record)">查看</a>
+                      </a-menu-item>
+                      <a-menu-item key="1">
+                        <a v-if="$auth('sb-infos-edit')" @click="handleEdit(record)">修改</a>
+                      </a-menu-item>
+                    </a-menu>
+                    <a-button> 操作 <a-icon type="down" /> </a-button>
+                  </a-dropdown>
+                </div>
+              </template>
+            </span>
+            <span slot="status" slot-scope="text">
+              <badge
+                :status="DictCache.COLOR.SB_INFO_STATUS[text]"
+                :text="statusMap[text]" />
+            </span>
+          </s-table>
+        </div>
+
+      </a-col>
+    </a-row>
+    <base-form ref="baseModal" @ok="handleOk"/>
+    <detail ref="detailModal" @ok="handleOk"/>
+    <download-modal ref="downloadModal"/>
+    <import-form-update ref="importModalUpdate" @ok="handleOk"/>
+    <preview-modal ref="previewModal"/>
+    <import-form-add ref="importModal" @ok="handleOk"/>
+  </a-card>
+
+</template>
+
+<script>
+import { STable, Ellipsis } from '@/components'
+import BaseForm from './modules/BaseForm'
+import Detail from './modules/Detail'
+import DownloadModal from '@/views/download/DownloadModal'
+import PreviewModal from '@/views/preview/PreviewModal'
+import { getMeasureWarn, deleteSbInfos, fetchSbInfo, exportSbInfoMeasure } from '@/api/sb/measure'
+import { fetchSbTypeTree } from '@/api/sb/type'
+import ImportFormAdd from './modules/ImportFormAdd'
+import ImportFormUpdate from './modules/ImportFormUpdate'
+
+export default {
+  name: 'MeasureSbInfoList',
+  components: {
+    STable,
+    Ellipsis,
+    BaseForm,
+    Detail,
+    DownloadModal,
+    PreviewModal,
+    ImportFormAdd,
+    ImportFormUpdate
+  },
+  props: {
+    filter: {
+      type: Number,
+      default: -1
+    }
+  },
+  data () {
+    return {
+      dateRange: [],
+      deptUserList: [],
+      // 查询参数
+      queryParam: {
+        filter: this.filter
+      },
+      depreciationTypeMap: {},
+      visible: true,
+      statusMap: {},
+      measureMap: {},
+      expandedKeys: [],
+      selectedKeys: [],
+      sourceTypeMap: {},
+      treeData: [],
+      // 表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'index',
+          width: 120,
+          checked: true,
+          customRender: (text, record, index) => {
+            return `${(this.$refs.table.localPagination.current - 1) * this.$refs.table.localPagination.pageSize + index + 1}`
+          }
+        },
+        {
+          title: '测量设备编号',
+          dataIndex: 'cardNo',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '设备名称',
+          checked: true,
+          width: 200,
+          dataIndex: 'name'
+        },
+        {
+          title: '出厂编号',
+          checked: true,
+          width: 200,
+          dataIndex: 'zzh'
+        },
+        {
+          title: '规格型号',
+          checked: true,
+          width: 200,
+          dataIndex: 'model'
+        },
+        {
+          title: '要求准确度等级',
+          dataIndex: 'zz',
+          width: 150,
+          checked: true
+        },
+
+        {
+          title: '使用部门',
+          checked: true,
+          width: 200,
+          dataIndex: 'saveUserName'
+        },
+        {
+          title: '使用地点',
+          checked: true,
+          width: 200,
+          dataIndex: 'cph'
+        },
+        {
+          title: '准确度等级',
+          checked: true,
+          width: 200,
+          dataIndex: 'fdjxh'
+        },
+        {
+          title: '检定日期',
+          checked: true,
+          width: 200,
+          dataIndex: 'checkDate'
+        },
+        {
+          title: '检定周期',
+          checked: true,
+          width: 200,
+          dataIndex: 'checkPeriod',
+          customRender: (text, record, index) => {
+            if (record.checkPeriod == null) {
+              return '未知'
+            } else {
+              return text + '月'
+            }
+          }
+        },
+        {
+          title: '有效日期',
+          dataIndex: 'nextCheckDate',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '生产厂商',
+          dataIndex: 'producerId',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '检定单位',
+          dataIndex: 'dph',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '检定人',
+          dataIndex: 'zaiz',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '检定结论',
+          dataIndex: 'rlType',
+          width: 150,
+          checked: true,
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.measureMap, text)
+          }
+        },
+        {
+          title: '是否周检',
+          dataIndex: 'color',
+          width: 150,
+          checked: true,
+          customRender: (text, record, index) => {
+            if (text === 0) {
+              return '否'
+            } else {
+              return '是'
+            }
+          }
+        },
+        {
+          title: '检定证书编号',
+          dataIndex: 'sbdh',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '检定校准记录',
+          dataIndex: 'zbh',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '预警天数',
+          dataIndex: 'seatNumber',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '是否固定资产',
+          dataIndex: 'isFinancing',
+          width: 150,
+          checked: true,
+          customRender: (text, record, index) => {
+            if (text === 0) {
+              return '否'
+            } else {
+              return '是'
+            }
+          }
+        },
+        {
+          title: '固定资产编号',
+          dataIndex: 'financingNo',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '设备新号',
+          dataIndex: 'no',
+          width: 150,
+          checked: true
+        },
+        {
+          title: '检定截止',
+          dataIndex: 'restDay',
+          width: 100,
+          fixed: 'right',
+          checked: true,
+          customRender: (text, record, index) => {
+            if (record.nextCheckDate == null) {
+              return '未知'
+            } else {
+              return this.BaseTool.Date.getCountBetween(new Date(), record.nextCheckDate, 1) + '天'
+            }
+          }
+        },
+        {
+          title: '管理状态',
+          checked: true,
+          dataIndex: 'status',
+          width: 100,
+          fixed: 'right',
+          scopedSlots: { customRender: 'status' }
+        },
+        {
+          title: '操作',
+          key: 'action',
+          checked: true,
+          fixed: 'right',
+          align: 'center',
+          width: '100',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        parameter = {
+          ...parameter,
+          ...this.queryParam,
+          dataScope: {
+            sortBy: 'asc',
+            sortName: 'no'
+          }
+        }
+        return getMeasureWarn(Object.assign(parameter, this.queryParam))
+          .then(res => {
+            return res.data
+          })
+      },
+      selectedRowKeys: [],
+      selectedRows: [],
+
+      options: {
+        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
+        rowSelection: {
+          selectedRowKeys: this.selectedRowKeys,
+          onChange: this.onSelectChange
+        }
+      },
+      optionAlertShow: false
+    }
+  },
+  created () {
+    this.tableOption()
+    this.measureMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_MEASURE_RESULT)
+    this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_MEASURE_STATUS)
+    this.isFinancingMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SB_IS_FINANCING)
+  },
+  methods: {
+    tableOption () {
+      this.setTree()
+      if (!this.optionAlertShow) {
+        this.options = {
+          alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
+          rowSelection: {
+            selectedRowKeys: this.selectedRowKeys,
+            onChange: this.onSelectChange,
+            getCheckboxProps: record => ({
+              props: {
+                disabled: false,
+                name: record.id
+              }
+            })
+          }
+        }
+        this.optionAlertShow = true
+      } else {
+        this.options = {
+          alert: false,
+          rowSelection: null
+        }
+        this.optionAlertShow = false
+      }
+    },
+    batchDelete (id) {
+      let ids = []
+      if (this.BaseTool.String.isBlank(id)) {
+        const length = this.selectedRows.length
+        if (length === 0) {
+          this.$message.info('请选择要删除的记录')
+          return
+        }
+        ids = this.selectedRows.map(item => item.id)
+      } else {
+        ids = [id]
+      }
+      deleteSbInfos(ids).then(res => {
+        this.$message.info('删除成功')
+        this.handleOk()
+        this.$refs.table.clearSelected()
+      })
+    },
+    handleEdit (record) {
+      fetchSbInfo({ id: record.id }).then(res => {
+        this.visible = false
+        const modal = this.$refs.baseModal
+        modal.base(res.data)
+      })
+    },
+    handleAdd () {
+      this.visible = false
+      this.$refs.baseModal.base()
+    },
+    handleAddRelate () {
+      this.visible = false
+      this.$refs.baseModal.base()
+    },
+    handleView (record) {
+      fetchSbInfo({ id: record.id }).then(res => {
+        this.visible = false
+        const modal = this.$refs.detailModal
+        modal.base(res.data)
+      })
+    },
+    handleOk () {
+      this.visible = true
+      this.setTree()
+      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
+      }
+      this.$refs.table.refresh()
+    },
+    onSelectChange (selectedRowKeys, selectedRows) {
+      this.selectedRowKeys = selectedRowKeys
+      this.selectedRows = selectedRows
+    },
+    resetSearchForm () {
+      this.queryParam = {
+        filter: this.filter
+      }
+      this.visible = true
+      this.$refs.table.refresh(true)
+    },
+    doExport () {
+      const parameter = {
+        ...this.queryParam
+      }
+      exportSbInfoMeasure(parameter).then(file => {
+        this.BaseTool.UPLOAD.downLoadExportExcel(file)
+      })
+    },
+    setTree (record = {}) {
+      fetchSbTypeTree().then(res => {
+        this.treeData = res.data
+      })
+    },
+    onSelect: function (selectedKeys, info) {
+      this.selectedKeys = selectedKeys
+      this.queryParam.typeId = selectedKeys.length > 0 ? selectedKeys[0] : ''
+      this.$refs.table.refresh(true)
+    },
+    onExpand (expandedKeys) {
+      this.expandedKeys = expandedKeys
+      this.autoExpandParent = false
+    },
+    doImport () {
+      this.$refs.importModal.base(null, null)
+    },
+    doImportForUpdate () {
+      this.$refs.importModalUpdate.base(null, null)
+    }
+  }
+}
+</script>

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

@@ -70,6 +70,16 @@
               v-decorator="['zzh']" />
           </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="['zz']" />
+          </a-form-item>
+        </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="使用部门"
@@ -281,7 +291,16 @@
               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
+              v-decorator="['zbh']" />
+          </a-form-item>
+        </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="备注"
@@ -469,6 +488,8 @@ export default {
           'no',
           'parentId',
           'parentSbName',
+          'zz',
+          'zbh',
           'isChild',
           'isShow',
           'isFinancing',

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

@@ -18,6 +18,7 @@
         <detail-list-item term="规格型号">{{ model.model }}</detail-list-item>
         <detail-list-item term="生产商">{{ model.producerId }}</detail-list-item>
         <detail-list-item term="出厂编号">{{ model.zzh }}</detail-list-item>
+        <detail-list-item term="要求准确度等级">{{ model.zz }}</detail-list-item>
         <detail-list-item term="使用部门">{{ model.useDept }}</detail-list-item>
         <detail-list-item term="使用位置">{{ model.cph }}</detail-list-item>
         <detail-list-item term="准确度等级">{{ model.fdjxh }}</detail-list-item>
@@ -33,6 +34,7 @@
         <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="检定校准记录">{{ model.zbh }}</detail-list-item>
         <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
       </detail-list>
     </div>
@@ -113,6 +115,8 @@ export default {
         'financingNoFour': null,
         'financingNoFive': null,
         'name': null,
+        'zz': null,
+        'zbh': null,
         'modelId': null,
         'typeId': null,
         'isShow': null,
@@ -176,7 +180,6 @@ export default {
         'positionId': null,
         'positionName': null,
         'dph': null,
-        'zz': null,
         'rlType': null,
         'color': null,
         'seatNumber': null,