From a6349745d9bbfc1a2a4d2571e3726aadf5503697 Mon Sep 17 00:00:00 2001
From: elliott <382696293@qq.com>
Date: Thu, 11 Jan 2024 16:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/entity/WxInstrumentSerial.java     |  36 ++
 .../domain/entity/WxUserInstrumentLog.java    |  10 +
 .../mapper/WxInstrumentSerialMapper.xml       |  16 +-
 .../WxInstrumentSerialController.java         |  14 +-
 .../WxUserInstrumentLogController.java        |  12 +
 .../impl/WxInstrumentSerialServiceImpl.java   |   7 +
 .../impl/WxUserInstrumentServiceImpl.java     |   1 +
 flossom-ui/src/api/system/instrumentSerial.js |  44 ++
 .../views/system/instrumentSerial/index.vue   | 457 ++++++++++++++++++
 9 files changed, 589 insertions(+), 8 deletions(-)
 create mode 100644 flossom-ui/src/api/system/instrumentSerial.js
 create mode 100644 flossom-ui/src/views/system/instrumentSerial/index.vue

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentSerial.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentSerial.java
index df85698..4199a4d 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentSerial.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxInstrumentSerial.java
@@ -5,6 +5,8 @@ import com.flossom.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 仪器序列号关联对象 wx_instrument_serial
  *
@@ -26,6 +28,10 @@ public class WxInstrumentSerial extends BaseEntity
     @Excel(name = "仪器名称")
     private String instrumentName;
 
+    /** 来源 */
+    @Excel(name = "来源")
+    private String source;
+
     /** 序列号 */
     @Excel(name = "序列号")
     private String serial;
@@ -42,6 +48,12 @@ public class WxInstrumentSerial extends BaseEntity
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private Long status;
 
+    // 查询用途
+    // 仪器集合名称集合
+    private List<String> instrumentIdArray;
+
+    private String queryInstrumentIds;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -106,6 +118,30 @@ public class WxInstrumentSerial extends BaseEntity
         return status;
     }
 
+    public List<String> getInstrumentIdArray() {
+        return instrumentIdArray;
+    }
+
+    public void setInstrumentIdArray(List<String> instrumentIdArray) {
+        this.instrumentIdArray = instrumentIdArray;
+    }
+
+    public String getQueryInstrumentIds() {
+        return queryInstrumentIds;
+    }
+
+    public void setQueryInstrumentIds(String queryInstrumentIds) {
+        this.queryInstrumentIds = queryInstrumentIds;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserInstrumentLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserInstrumentLog.java
index 1f17c90..09e88e8 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserInstrumentLog.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserInstrumentLog.java
@@ -60,6 +60,8 @@ public class WxUserInstrumentLog extends BaseEntity
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private Long status;
 
+    private WxUserMember wxUserMember;
+
     public Long getUserInstrumentId() {
         return userInstrumentId;
     }
@@ -159,6 +161,14 @@ public class WxUserInstrumentLog extends BaseEntity
         return status;
     }
 
+    public WxUserMember getWxUserMember() {
+        return wxUserMember;
+    }
+
+    public void setWxUserMember(WxUserMember wxUserMember) {
+        this.wxUserMember = wxUserMember;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml
index 700721b..5b4a9cd 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentSerialMapper.xml
@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="instrumentId"    column="instrument_id"    />
         <result property="instrumentName"    column="instrument_name"    />
         <result property="serial"    column="serial"    />
+        <result property="source"    column="source"    />
         <result property="bindingStatus"    column="binding_status"    />
         <result property="validStatus"    column="valid_status"    />
         <result property="status"    column="status"    />
@@ -26,11 +27,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="instrumentId != null "> and instrument_id = #{instrumentId}</if>
             <if test="instrumentName != null  and instrumentName != ''"> and instrument_name like concat('%', #{instrumentName}, '%')</if>
-            <if test="serial != null  and serial != ''"> and serial = #{serial}</if>
+            <if test="serial != null  and serial != ''"> and serial  like concat('%', #{serial}, '%')</if>
+            <if test="source != null  and source != ''"> and `source`  like concat('%', #{source}, '%')</if>
             <if test="bindingStatus != null "> and binding_status = #{bindingStatus}</if>
             <if test="validStatus != null "> and valid_status = #{validStatus}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="remark != null "> and remark  like concat('%', #{remark}, '%')</if>
+            <if test="queryInstrumentIds!=null and queryInstrumentIds !=''">
+                and
+                <foreach collection="queryInstrumentIds.split(',')" index="index" item="item" open="(" separator="OR"
+                         close=")">
+                    instrument_id = #{item}
+                </foreach>
+            </if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectWxInstrumentSerialById" parameterType="Long" resultMap="WxInstrumentSerialResult">
@@ -44,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instrumentId != null">instrument_id,</if>
             <if test="instrumentName != null and instrumentName != ''">instrument_name,</if>
             <if test="serial != null and serial != ''">serial,</if>
+            <if test="source != null and source != ''">`source`,</if>
             <if test="bindingStatus != null">binding_status,</if>
             <if test="validStatus != null">valid_status,</if>
             <if test="status != null">status,</if>
@@ -55,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instrumentId != null">#{instrumentId},</if>
             <if test="instrumentName != null and instrumentName != ''">#{instrumentName},</if>
             <if test="serial != null and serial != ''">#{serial},</if>
+            <if test="source != null and source != ''">#{source},</if>
             <if test="bindingStatus != null">#{bindingStatus},</if>
             <if test="validStatus != null">#{validStatus},</if>
             <if test="status != null">#{status},</if>
@@ -70,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instrumentId != null">instrument_id = #{instrumentId},</if>
             <if test="instrumentName != null and instrumentName != ''">instrument_name = #{instrumentName},</if>
             <if test="serial != null and serial != ''">serial = #{serial},</if>
+            <if test="source != null and source != ''">`source` = #{source},</if>
             <if test="bindingStatus != null">binding_status = #{bindingStatus},</if>
             <if test="validStatus != null">valid_status = #{validStatus},</if>
             <if test="status != null">status = #{status},</if>
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentSerialController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentSerialController.java
index c981040..7bbdd41 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentSerialController.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentSerialController.java
@@ -30,7 +30,7 @@ import com.flossom.system.service.IWxInstrumentSerialService;
  * @date 2024-01-10
  */
 @RestController
-@RequestMapping("/serial")
+@RequestMapping("/instrumentSerial")
 public class WxInstrumentSerialController extends BaseController
 {
     @Autowired
@@ -39,7 +39,7 @@ public class WxInstrumentSerialController extends BaseController
     /**
      * 查询仪器序列号关联列表
      */
-    @RequiresPermissions("system:serial:list")
+    @RequiresPermissions("system:instrumentSerial:list")
     @GetMapping("/list")
     public TableDataInfo list(WxInstrumentSerial wxInstrumentSerial)
     {
@@ -51,7 +51,7 @@ public class WxInstrumentSerialController extends BaseController
     /**
      * 导出仪器序列号关联列表
      */
-    @RequiresPermissions("system:serial:export")
+    @RequiresPermissions("system:instrumentSerial:export")
     @Log(title = "仪器序列号关联", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, WxInstrumentSerial wxInstrumentSerial)
@@ -64,7 +64,7 @@ public class WxInstrumentSerialController extends BaseController
     /**
      * 获取仪器序列号关联详细信息
      */
-    @RequiresPermissions("system:serial:query")
+    @RequiresPermissions("system:instrumentSerial:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -74,7 +74,7 @@ public class WxInstrumentSerialController extends BaseController
     /**
      * 新增仪器序列号关联
      */
-    @RequiresPermissions("system:serial:add")
+    @RequiresPermissions("system:instrumentSerial:add")
     @Log(title = "仪器序列号关联", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody WxInstrumentSerial wxInstrumentSerial)
@@ -85,7 +85,7 @@ public class WxInstrumentSerialController extends BaseController
     /**
      * 修改仪器序列号关联
      */
-    @RequiresPermissions("system:serial:edit")
+    @RequiresPermissions("system:instrumentSerial:edit")
     @Log(title = "仪器序列号关联", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody WxInstrumentSerial wxInstrumentSerial)
@@ -96,7 +96,7 @@ public class WxInstrumentSerialController extends BaseController
     /**
      * 删除仪器序列号关联
      */
-    @RequiresPermissions("system:serial:remove")
+    @RequiresPermissions("system:instrumentSerial:remove")
     @Log(title = "仪器序列号关联", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentLogController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentLogController.java
index 7001cb9..cb849a5 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentLogController.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxUserInstrumentLogController.java
@@ -2,9 +2,12 @@ package com.flossom.system.controller;
 
 import java.util.List;
 import java.io.IOException;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
+import com.flossom.common.core.domain.entity.WxUserInstrument;
 import com.flossom.common.core.domain.entity.WxUserInstrumentLog;
+import com.flossom.common.core.domain.entity.WxUserMember;
 import com.flossom.common.core.utils.poi.ExcelUtil;
 import com.flossom.common.core.web.controller.BaseController;
 import com.flossom.common.core.web.domain.AjaxResult;
@@ -12,6 +15,7 @@ import com.flossom.common.core.web.page.TableDataInfo;
 import com.flossom.common.log.annotation.Log;
 import com.flossom.common.log.enums.BusinessType;
 import com.flossom.common.security.annotation.RequiresPermissions;
+import com.flossom.system.service.IWxUserMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -35,6 +39,8 @@ public class WxUserInstrumentLogController extends BaseController
 {
     @Autowired
     private IWxUserInstrumentLogService wxUserInstrumentLogService;
+    @Autowired
+    private IWxUserMemberService wxUserMemberService;
 
     /**
      * 查询用户仪器绑定日志列表
@@ -45,6 +51,12 @@ public class WxUserInstrumentLogController extends BaseController
     {
         startPage();
         List<WxUserInstrumentLog> list = wxUserInstrumentLogService.selectWxUserInstrumentLogList(wxUserInstrumentLog);
+        for (WxUserInstrumentLog instrumentLog: list) {
+            if (Objects.nonNull(instrumentLog.getUserId())) {
+                WxUserMember wxUserMember = wxUserMemberService.selectWxUserMemberByIdInit(instrumentLog.getUserId());
+                instrumentLog.setWxUserMember(wxUserMember);
+            }
+        }
         return getDataTable(list);
     }
 
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java
index e8bf7ce..ddea0ee 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentSerialServiceImpl.java
@@ -1,6 +1,7 @@
 package com.flossom.system.service.impl;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.flossom.common.core.domain.entity.WxInstrumentSerial;
 import com.flossom.common.core.mapper.WxInstrumentSerialMapper;
@@ -8,6 +9,7 @@ import com.flossom.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.flossom.system.service.IWxInstrumentSerialService;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 仪器序列号关联Service业务层处理
@@ -42,6 +44,11 @@ public class WxInstrumentSerialServiceImpl implements IWxInstrumentSerialService
     @Override
     public List<WxInstrumentSerial> selectWxInstrumentSerialList(WxInstrumentSerial wxInstrumentSerial)
     {
+        // 处理仪器字段
+        if (!CollectionUtils.isEmpty(wxInstrumentSerial.getInstrumentIdArray())) {
+            String instrumentIds = wxInstrumentSerial.getInstrumentIdArray().stream().map(String::valueOf).collect(Collectors.joining(","));
+            wxInstrumentSerial.setQueryInstrumentIds(instrumentIds);
+        }
         return wxInstrumentSerialMapper.selectWxInstrumentSerialList(wxInstrumentSerial);
     }
 
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java
index 18fc8db..c7a5b39 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserInstrumentServiceImpl.java
@@ -172,6 +172,7 @@ public class WxUserInstrumentServiceImpl implements IWxUserInstrumentService
         // 查询序列号是否有效存在
         WxInstrumentSerial serial = new WxInstrumentSerial();
         serial.setSerial(wxUserInstrument.getSerial());
+        serial.setValidStatus(1); // 有效
         List<WxInstrumentSerial> serialList = instrumentSerialMapper.selectWxInstrumentSerialList(serial);
         if (CollectionUtils.isEmpty(serialList)) {
             resultMap.put("message","序列号无效,请确定后再绑定");
diff --git a/flossom-ui/src/api/system/instrumentSerial.js b/flossom-ui/src/api/system/instrumentSerial.js
new file mode 100644
index 0000000..5bdd36d
--- /dev/null
+++ b/flossom-ui/src/api/system/instrumentSerial.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询仪器序列号关联列表
+export function listSerial(query) {
+  return request({
+    url: '/system/instrumentSerial/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仪器序列号关联详细
+export function getSerial(id) {
+  return request({
+    url: '/system/instrumentSerial/' + id,
+    method: 'get'
+  })
+}
+
+// 新增仪器序列号关联
+export function addSerial(data) {
+  return request({
+    url: '/system/instrumentSerial',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仪器序列号关联
+export function updateSerial(data) {
+  return request({
+    url: '/system/instrumentSerial',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仪器序列号关联
+export function delSerial(id) {
+  return request({
+    url: '/system/instrumentSerial/' + id,
+    method: 'delete'
+  })
+}
diff --git a/flossom-ui/src/views/system/instrumentSerial/index.vue b/flossom-ui/src/views/system/instrumentSerial/index.vue
new file mode 100644
index 0000000..7af680e
--- /dev/null
+++ b/flossom-ui/src/views/system/instrumentSerial/index.vue
@@ -0,0 +1,457 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="序列号" prop="serial">
+        <el-input
+          v-model="queryParams.serial"
+          placeholder="请输入序列号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仪器名称" prop="instrumentIdArray">
+        <el-select
+          v-model="queryParams.instrumentIdArray"
+          placeholder="请选择类型"
+          multiple
+          :style="{ width: '100%' }"
+          clearable
+        >
+          <el-option
+            v-for="item in instrumentList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="绑定状态" prop="bindingStatus">
+        <el-select
+          v-model="queryParams.bindingStatus"
+          placeholder="请选择状态"
+          :style="{ width: '100%' }"
+          clearable
+        >
+          <el-option label="全部" value="" />
+          <el-option label="已绑定" value="0" />
+          <el-option label="未绑定" value="1" />
+          <el-option label="已解绑" value="1" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="有效状态" prop="validStatus">
+        <el-select
+          v-model="queryParams.validStatus"
+          placeholder="请选择状态"
+          :style="{ width: '100%' }"
+          clearable
+        >
+          <el-option label="全部" value="" />
+          <el-option label="有效" value="1" />
+          <el-option label="无效" value="0" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="来源" prop="source">
+        <el-input
+          v-model="queryParams.source"
+          placeholder="请输入来源"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:instrumentSerial:add']"
+        >新增</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['system:instrumentSerial:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['system:instrumentSerial:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['system:instrumentSerial:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="serialList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="序列号" align="center" prop="serial" />
+      <el-table-column label="仪器" align="center" prop="instrumentName" />
+      <el-table-column label="绑定状态" align="center" prop="bindingStatus" >
+        <template slot-scope="scope">
+          <span v-show="scope.row.bindingStatus == 0">已绑定</span>
+          <span v-show="scope.row.bindingStatus == 1">未绑定</span>
+          <span v-show="scope.row.bindingStatus == 2">已解绑</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="有效状态" align="center" prop="validStatus" >
+        <template slot-scope="scope">
+          <span v-show="scope.row.validStatus == 0">无效</span>
+          <span v-show="scope.row.validStatus == 1">有效</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="来源" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:instrumentSerial:edit']"
+          >编辑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="detailShow(scope.row)"
+            v-hasPermi="['system:instrumentSerial:remove']"
+          >绑定记录</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-share"
+            @click="codeShow(scope.row)"
+            v-hasPermi="['system:instrumentSerial:remove']"
+          >二维码</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改仪器序列号关联对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="仪器id" prop="instrumentId">-->
+<!--          <el-input v-model="form.instrumentId" placeholder="请输入仪器id" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="仪器型号" prop="instrumentName">
+          <el-select :disabled="isDisabled(form)"
+            v-model="form.instrumentId"
+            placeholder="请选择型号"
+            :style="{ width: '100%' }"
+            clearable
+          >
+            <el-option
+              v-for="item in instrumentList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="序列号" prop="serial" >
+          <el-input v-model="form.serial" placeholder="请输入序列号" :disabled="isDisabled(form)" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" maxlength="50"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 详情记录对话框 -->
+    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="880px" append-to-body>
+      <el-table v-loading="loading" :data="userInstrumentLogList">
+        <el-table-column label="序号" align="center" prop="id" />
+        <el-table-column label="会员昵称" align="center" prop="wxUserMember.nickName" />
+        <el-table-column label="手机号码" align="center" prop="wxUserMember.mobile" />
+        <el-table-column label="用户编号" align="center" prop="wxUserMember.id" />
+        <el-table-column label="仪器名称" align="center" prop="instrumentName" />
+        <el-table-column label="仪器序列号" align="center" prop="serial" />
+        <el-table-column label="类型" align="center" prop="bindingStatus" >
+          <template slot-scope="scope">
+            <span v-show="scope.row.bindingStatus == 0">已绑定</span>
+            <span v-show="scope.row.bindingStatus == 1">未绑定</span>
+            <span v-show="scope.row.bindingStatus == 2">已解绑</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作时间" align="center" prop="createTime" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="logTotal>0"
+        :total="logTotal"
+        :page.sync="queryLogParams.pageNum"
+        :limit.sync="queryLogParams.pageSize"
+        @pagination="getList"
+      />
+    </el-dialog>
+
+<!-- 二维码-->
+    <el-dialog :title="codeTitle" :visible.sync="codeOpen" width="780px" append-to-body>
+        <div class="demo-image__lazy">
+          <el-image :key="codeUrl" :src="codeUrl" :preview-src-list="[codeUrl]" lazy></el-image>
+        </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSerial, getSerial, delSerial, addSerial, updateSerial } from "@/api/system/instrumentSerial";
+import {listInstrument} from "@/api/system/instrument";
+import {listLog} from "@/api/system/userInstrumentLog"
+
+export default {
+  name: "Serial",
+  data() {
+    return {
+      codeUrl: "",
+      // 二维码标题
+      codeTitle: "二维码",
+      // 二维码弹窗
+      codeOpen: false,
+      // 详情标题
+      detailTitle: "记录详情",
+      // 详情弹窗
+      detailOpen: false,
+      // 用户仪器绑定日记表格数据
+      userInstrumentLogList: [],
+      // 仪器列表
+      instrumentList: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      logTotal: 0,
+      // 仪器序列号关联表格数据
+      serialList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      queryLogParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userInstrumentId: null,
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        instrumentId: null,
+        source: null,
+        instrumentName: null,
+        serial: null,
+        bindingStatus: null,
+        validStatus: null,
+        status: null,
+        instrumentIdArray: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        instrumentId: [
+          { required: true, message: "仪器id不能为空", trigger: "blur" }
+        ],
+        instrumentName: [
+          { required: true, message: "仪器名称不能为空", trigger: "blur" }
+        ],
+        serial: [
+          { required: true, message: "序列号不能为空", trigger: "blur" }
+        ],
+        bindingStatus: [
+          { required: true, message: "绑定状态，1未绑定，2已解绑不能为空", trigger: "change" }
+        ],
+        validStatus: [
+          { required: true, message: "序列号有效状态，1有效，0无效不能为空", trigger: "change" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.queryInstrument();
+  },
+  methods: {
+    isDisabled(row){
+      if (row.id) {
+        return true;
+      }
+      return false
+    },
+    queryInstrument(){
+      listInstrument({}).then(response => {
+        this.instrumentList = response.rows;
+      });
+    },
+    /** 查询仪器序列号关联列表 */
+    getList() {
+      this.loading = true;
+      listSerial(this.queryParams).then(response => {
+        this.serialList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        instrumentId: null,
+        instrumentName: null,
+        serial: null,
+        bindingStatus: null,
+        validStatus: null,
+        status: null,
+        createBy: null,
+        createTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 展示详情 */
+    detailShow(row){
+      this.queryLogParams.serial = row.serial;
+      listLog(this.queryLogParams).then(response => {
+        this.detailOpen = true;
+        this.userInstrumentLogList = response.rows;
+        this.logTotal = response.total;
+      });
+
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加仪器序列号关联";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getSerial(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改仪器序列号关联";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateSerial(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSerial(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除仪器序列号关联编号为"' + ids + '"的数据项？').then(function() {
+        return delSerial(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/serial/export', {
+        ...this.queryParams
+      }, `serial_${new Date().getTime()}.xlsx`)
+    },
+    codeShow(row){
+      this.codeUrl = process.env.VUE_APP_BASE_API + '/system/qrcode/create?serial=' + row.serial;
+      this.codeOpen = true;
+    }
+  }
+};
+</script>