408249787 2 жил өмнө
parent
commit
3aae108291

+ 28 - 0
src/views/sb/info/SbInfo.vue

@@ -154,6 +154,9 @@
                   <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
                     <a-menu-item key="1"><a-icon type="delete" /><a>删除</a></a-menu-item>
                   </a-popconfirm>
+                  <a-popconfirm :visible="false" @visibleChange="batchIncorrect()">
+                    <a-menu-item key="1"><my-icon type="icon-pandian" /><a>检定</a></a-menu-item>
+                  </a-popconfirm>
                 </a-menu>
                 <a-button style="margin-left: 8px">
                   批量操作 <a-icon type="down" />
@@ -190,6 +193,9 @@
                         <a-menu-item key="1">
                           <a v-if="$auth('sb-infos-edit')" @click="handleEdit(record)">修改</a>
                         </a-menu-item>
+                        <a-menu-item key="2">
+                          <a @click="batchIncorrect(record)">检定</a>
+                        </a-menu-item>
                         <a-menu-item v-if="record.status != 2" key="2">
                           <a-popconfirm title="是否要启用该设备?" @confirm="handleStart(record)">
                             <a>启用</a>
@@ -233,6 +239,7 @@
     <print-sb-code ref="printSbCode"/>
     <print-in-sb-info-batch ref="printInSbInfoBatch" @ok="handleOk"/>
     <detail-sb-measure ref="detailSbMeasureModal" @ok="handleOk"/>
+    <base-form-measure ref="baseModalMeasure" @ok="handleOk"/>
 
   </div>
 </template>
@@ -243,6 +250,8 @@ import BaseForm from './modules/BaseForm'
 import DetailSbMeasure from '@/views/sb/measurelog/modules/DetailSbCheckBatch'
 import BaseFormStatusLog from '@/views/sb/status-log/modules/BaseForm'
 import Detail from './modules/Detail'
+import BaseFormMeasure from './modules/BaseFormMeasure'
+
 import DownloadModal from '@/views/download/DownloadModal'
 import PreviewModal from '@/views/preview/PreviewModal'
 import { getSbInfoPage, deleteSbInfos, fetchSbInfo, fetchSbInfos, exportSbInfo } from '@/api/sb/info'
@@ -271,6 +280,8 @@ export default {
     ImportFormAddStandard,
     ImportFormUpdate,
     PrintInSbInfoBatch,
+    BaseFormMeasure,
+
     BaseFormStatusLog
   },
   props: {
@@ -627,6 +638,23 @@ export default {
         modal.base([res.data])
       })
     },
+    batchIncorrect (id) {
+      let ids = []
+      if (this.BaseTool.String.isBlank(id)) {
+        const length = this.selectedRows.length
+        if (length === 0) {
+          this.$message.info('请选择要填报的设备')
+          return
+        }
+        ids = this.selectedRows
+      } else {
+        ids = [id]
+      }
+      console.log(ids)
+      this.visible = false
+      const modal = this.$refs.baseModalMeasure
+      modal.base(ids)
+    },
     handleMeasureBatch () {
       const modal = this.$refs.detailSbMeasureModal
       modal.base()

+ 1 - 0
src/views/sb/info/modules/BaseFormMeasure.vue

@@ -193,6 +193,7 @@ export default {
           remark: '',
           name: this.username,
           sbId: item.id,
+          type: 1,
           checkImgList: [],
           checkFileList: []
         }