From d9bd4cfe2905b9e98009d35c124f6d2d9a0dd5e7 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Tue, 29 Oct 2024 18:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E7=BB=91=E5=AE=9A=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ma/device.js                          |   9 +
 src/api/purchase/goodsBind.js                 | 100 ++
 src/router/index.js                           |   5 +
 src/utils/chapter.js                          |  76 ++
 src/utils/globalUrl.js                        |  19 +
 src/views/material/ma/device/index.vue        |  46 +-
 src/views/material/ma/supplier/index.vue      |  24 +-
 .../goodsBind/component/bindQrTools.vue       | 914 ++++++++++++++++++
 .../goodsBind/component/bindTools.vue         | 665 +++++++++++++
 .../purchase/goodsBind/component/home.vue     | 575 +++++++++++
 .../material/purchase/goodsBind/index.vue     |  79 ++
 src/views/qrCode/qrCode.vue                   | 226 +++++
 12 files changed, 2720 insertions(+), 18 deletions(-)
 create mode 100644 src/api/purchase/goodsBind.js
 create mode 100644 src/utils/chapter.js
 create mode 100644 src/utils/globalUrl.js
 create mode 100644 src/views/material/purchase/goodsBind/component/bindQrTools.vue
 create mode 100644 src/views/material/purchase/goodsBind/component/bindTools.vue
 create mode 100644 src/views/material/purchase/goodsBind/component/home.vue
 create mode 100644 src/views/material/purchase/goodsBind/index.vue
 create mode 100644 src/views/qrCode/qrCode.vue

diff --git a/src/api/ma/device.js b/src/api/ma/device.js
index a60090dc..c5d052e2 100644
--- a/src/api/ma/device.js
+++ b/src/api/ma/device.js
@@ -27,6 +27,15 @@ export function getDeviceType(query) {
   })
 }
 
+// 资产属性下拉框-
+export function getZichanType(query) {
+  return request({
+    url: '/material/bm_asset_attributes/list',
+    method: 'get',
+    params: query
+  })
+}
+
 // 仓库管理--删除
 export function delDevice(id) {
   return request({
diff --git a/src/api/purchase/goodsBind.js b/src/api/purchase/goodsBind.js
new file mode 100644
index 00000000..b6fbb8a5
--- /dev/null
+++ b/src/api/purchase/goodsBind.js
@@ -0,0 +1,100 @@
+import request from '@/utils/request'
+
+//机具类型管理列表信息
+export function getListNewBuyBind(query) {
+  return request({
+      url: '/material/purchase/bind/list',
+      method: 'get',
+      params: query,
+  })
+}
+
+//任务 详情
+export function getListDetail(query) {
+  return request({
+      url: '/material/purchase/bind/details',
+      method: 'get',
+      params: query,
+  })
+}
+
+//任务 详情
+export function bindAllData(data) {
+  return request({
+      url: '/material/purchase/bind/bind',
+      method: 'post',
+      data: data,
+  })
+}
+
+//二级页面 详情
+export function getListDetailById(query) {
+  return request({
+      url: '/material/purchase/bind/getById',
+      method: 'get',
+      params: query,
+  })
+}
+
+// 导出
+export function exportNewBuy(data) {
+  return request({
+      url: '/material/purchase/bind/downloadQrCode',
+      method: 'post',
+      responseType: 'blob',
+      data: data
+  })
+}
+
+
+
+//人员 详情
+export function getNoticePeople(query) {
+  return request({
+      url: '/material/purchase_notice_person/list',
+      method: 'get',
+      params: query,
+  })
+}
+
+// 人员--删除
+export function delPeople(ids) {
+  return request({
+      url: '/material/purchase_notice_person/' + ids,
+      method: 'delete',
+  })
+}
+
+// 人员管理--新增
+export function addNoticeUser(data) {
+  return request({
+      url: '/material/purchase_notice_person/batchAddNoticePerson',
+      method: 'post',
+      data: data,
+  })
+}
+
+// 仓库管理--修改
+export function bmNoticeInfo(data) {
+  return request({
+      url: '/material/purchase_notice_person/batchSendSms',
+      method: 'put',
+      data: data,
+  })
+}
+
+
+//机具类型管理列表信息
+export function getUserAll() {
+  return request({
+      url: '/system/user/list',
+      method: 'get',
+  })
+}
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 493b19f0..7c7c95c7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -74,6 +74,11 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/qrCode/qrCodePage',
+    component: () => import('@/views/qrCode/qrCode'),
+    hidden: true
+  },
   {
     path: '/user',
     component: Layout,
diff --git a/src/utils/chapter.js b/src/utils/chapter.js
new file mode 100644
index 00000000..69871a34
--- /dev/null
+++ b/src/utils/chapter.js
@@ -0,0 +1,76 @@
+let chapter = (text, companyName) => {
+    let canvas = document.getElementById("canvas");
+    let context = canvas.getContext("2d");
+  
+    //let text = "XXX专用章";
+    //let companyName = "XXX科技股份有限公司";
+  
+    // 绘制印章边框
+    let width = canvas.width / 2;
+    let height = canvas.height / 2;
+    context.lineWidth = 3;
+    context.strokeStyle = "#f00";
+    context.beginPath();
+    context.arc(width, height, 80, 0, Math.PI * 2); //宽、高、半径
+    context.stroke();
+  
+    //画五角星
+    create5star(context, width, height, 20, "#f00", 0);
+  
+    // 绘制印章名称
+    context.font = "14px 宋体";
+    context.textBaseline = "middle"; //设置文本的垂直对齐方式
+    context.textAlign = "center"; //设置文本的水平对对齐方式
+    context.lineWidth = 1;
+    context.strokeStyle = "#f00";
+    context.strokeText(text, width, height + 50);
+  
+    // 绘制印章单位
+    context.translate(width, height); // 平移到此位置,
+    context.font = "14px 宋体";
+    let count = companyName.length; // 字数
+    let angle = (4 * Math.PI) / (3 * (count - 1)); // 字间角度
+    let chars = companyName.split("");
+    let c;
+    for (let i = 0; i < count; i++) {
+      c = chars[i]; // 需要绘制的字符
+      if (i == 0) {
+        context.rotate((5 * Math.PI) / 6);
+      } else {
+        context.rotate(angle);
+      }
+  
+      context.save();
+      context.translate(65, 0); // 平移到此位置,此时字和x轴垂直，公司名称和最外圈的距离
+      context.rotate(Math.PI / 2); // 旋转90度,让字平行于x轴
+      context.strokeText(c, 0, 0); // 此点为字的中心点
+      context.restore();
+    }
+  
+    //绘制五角星
+    function create5star(context, sx, sy, radius, color, rotato) {
+      context.save();
+      context.fillStyle = color;
+      context.translate(sx, sy); //移动坐标原点
+      context.rotate(Math.PI + rotato); //旋转
+      context.beginPath(); //创建路径
+      // let x = Math.sin(0);
+      // let y = Math.cos(0);
+      let dig = (Math.PI / 5) * 4;
+      for (let i = 0; i < 5; i++) {
+        //画五角星的五条边
+        let x = Math.sin(i * dig);
+        let y = Math.cos(i * dig);
+        context.lineTo(x * radius, y * radius);
+      }
+      context.closePath();
+      context.stroke();
+      context.fill();
+      context.restore();
+    }
+  };
+  
+  export default chapter;
+  
+  
+  
\ No newline at end of file
diff --git a/src/utils/globalUrl.js b/src/utils/globalUrl.js
new file mode 100644
index 00000000..c4872dae
--- /dev/null
+++ b/src/utils/globalUrl.js
@@ -0,0 +1,19 @@
+// const qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='; //测试
+// const qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='; //重庆
+// const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
+// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
+const qrUrl = 'http://192.168.0.110:80/qrCode/qrCodePage?qrCode='; //本地
+// const qrUrl = process.env.NODE_ENV === 'production' ? 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
+// let qrUrl = ''
+const origin = window.location.origin
+
+// qrUrl = origin + '/qrCode/qrCodePage?qrCode='
+// if (origin == 'http://112.29.103.165:21626') {
+//     qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='
+// } else {
+//     qrUrl = 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode='
+// }
+
+export default {
+    qrUrl,
+}
diff --git a/src/views/material/ma/device/index.vue b/src/views/material/ma/device/index.vue
index 01dc9812..8eb3ba81 100644
--- a/src/views/material/ma/device/index.vue
+++ b/src/views/material/ma/device/index.vue
@@ -68,7 +68,7 @@
         <el-table-column label="设备类型" align="center" prop="materialName" sortable/>
         <el-table-column label="规格型号" align="center" prop="materialModel" sortable/>
         <el-table-column label="设备编号" align="center" prop="maCode" sortable/>
-        <el-table-column label="设备状态" align="center" prop="maStatus" sortable/>
+        <el-table-column label="设备状态" align="center" prop="statusName" sortable/>
         <el-table-column label="固定资产编号" align="center" prop="assetsCode" sortable/>
         <el-table-column label="设备原编号" align="center" prop="preCode" sortable/>
         <el-table-column label="购置批次" align="center" prop="buyTask" sortable/>
@@ -157,8 +157,8 @@
                       </el-form-item>
             </el-col>
             <el-col :span="7">
-                    <el-form-item label="设备状态" prop="maStatus">
-                      <el-input v-model="form.maStatus" placeholder="请输入" maxlength="20" disabled/>
+                    <el-form-item label="设备状态" prop="statusName">
+                      <el-input v-model="form.statusName" placeholder="请输入" maxlength="20" disabled/>
                       </el-form-item>
             </el-col>
             <el-col :span="7">
@@ -192,8 +192,8 @@
                       </el-form-item>
             </el-col>
             <el-col :span="7">
-                    <el-form-item label="本次检验人员" prop="houseName">
-                      <el-input v-model="form.houseName" placeholder="请输入" maxlength="20" disabled/>
+                    <el-form-item label="本次检验人员" prop="checkMan">
+                      <el-input v-model="form.checkMan" placeholder="请输入" maxlength="20" disabled/>
                       </el-form-item>
             </el-col>
             <el-col :span="7">
@@ -210,8 +210,15 @@
                       </el-form-item>
             </el-col>
             <el-col :span="7">
-                    <el-form-item label="资产属性" prop="houseName">
-                      <el-input v-model="form.houseName" placeholder="请输入" maxlength="20" disabled/>
+                    <el-form-item label="资产属性" prop="assetsId">
+                      <el-select v-model="form.assetsId" placeholder="请选择资产属性" clearable style="width: 100%;" >
+                        <el-option
+                          v-for="dict in ZichanTypeList"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
                       </el-form-item>
             </el-col>
             <el-col :span="7">
@@ -233,15 +240,15 @@
                       </el-form-item>
             </el-col>
             <el-col :span="7">
-                    <el-form-item label="库管员" prop="houseName">
-                      <el-input v-model="form.houseName" placeholder="请输入" maxlength="20" disabled/>
+                    <el-form-item label="库管员" prop="keeperName">
+                      <el-input v-model="form.keeperName" placeholder="请输入" maxlength="20" disabled/>
                       </el-form-item>
             </el-col>
         </el-row> 
         <el-row :gutter="24">  
             <el-col :span="7">
-                    <el-form-item label="维修员" prop="houseName">
-                      <el-input v-model="form.houseName" placeholder="请输入" maxlength="20" disabled/>
+                    <el-form-item label="维修员" prop="repairName">
+                      <el-input v-model="form.repairName" placeholder="请输入" maxlength="20" disabled/>
                       </el-form-item>
             </el-col>
         </el-row> 
@@ -276,7 +283,7 @@
   </template> 
   
   <script>
-  import { getListDevice,getDeviceDetail,editDevice,addDevice,delDevice,getDeviceType } from "@/api/ma/device";
+  import { getListDevice,getDeviceDetail,editDevice,addDevice,delDevice,getDeviceType,getZichanType } from "@/api/ma/device";
   import { downloadFile } from '@/utils/download'
   import { getToken } from '@/utils/auth'
   export default {
@@ -312,6 +319,7 @@
         // 施工记录表格数据
         deviceList: [],
         materialTypeList:[],
+        ZichanTypeList:[],
         materialNameList:[],
         materialModelList:[],
         maxLength:100,//已选列表上限，防止数据过多请求报错
@@ -366,6 +374,7 @@
       };
     },
     created() {
+      this.getZichanType();
       this.getDeviceType();
       this.getList();
     },
@@ -400,6 +409,19 @@
         });
       },
 
+      //查询资产属性下拉框
+      getZichanType(){
+          getZichanType({isAll:1}).then(response => {
+          let matTypeRes = response.data;
+          this.ZichanTypeList = matTypeRes.map((item) => {
+                return {
+                label: item.assetName,
+                value: item.id,
+                };
+            });
+        });
+      },
+
       /** 查询岗位列表 */
       getList() {
         this.loading = true;
diff --git a/src/views/material/ma/supplier/index.vue b/src/views/material/ma/supplier/index.vue
index 30e07166..9b387df5 100644
--- a/src/views/material/ma/supplier/index.vue
+++ b/src/views/material/ma/supplier/index.vue
@@ -223,8 +223,8 @@
       </el-dialog>
   
       <!-- 图片查看弹窗 -->
-    <el-dialog :visible.sync="dialogVisible" width="500px" height="500px" >
-      <img width="100%" height="500px" :src="dialogImageUrl"  />
+    <el-dialog :visible.sync="dialogVisible" width="600px" height="600px" >
+      <img width="100%" height="100%" :src="dialogImageUrl"  />
     </el-dialog>
     </div>
   </template> 
@@ -301,7 +301,14 @@
         form: {},
        // 表单校验
        rules: {
-                
+         phone: [
+          {
+            require:false,
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ],    
             },
 
         //上传
@@ -357,10 +364,11 @@
       
       //上传组件-图片查看
       picturePreview(file) {
+        console.log('file',file)
         this.dialogImageUrl = file.url;
         const parts = file.name.split('.');
         const extension = parts.pop();
-        if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+        if(extension === 'pdf'){
           const windowName = file.name;
           window.open(file.url,windowName)
         }else{
@@ -441,7 +449,7 @@
                   })
         }
         fileList.forEach(file=>{
-                  if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+                  if(extension === 'pdf'){
                       this.urlTemp = require('../../../../assets/file.png');
                   
                   }
@@ -474,7 +482,11 @@
           const supplierId = row.supplierId 
             getFacturerDetail(supplierId).then((response) => {
                 this.form = response.data;
-
+                if(response.data.businessLicenseFileList!=null){
+                this.businessLicenseListTemp = response.data.businessLicenseFileList;
+                }else{
+                this.businessLicenseListTemp = [];
+                }
                 this.showHouse = true
                 this.title = '修改'
             })
diff --git a/src/views/material/purchase/goodsBind/component/bindQrTools.vue b/src/views/material/purchase/goodsBind/component/bindQrTools.vue
new file mode 100644
index 00000000..3d60c1c1
--- /dev/null
+++ b/src/views/material/purchase/goodsBind/component/bindQrTools.vue
@@ -0,0 +1,914 @@
+<template>
+    <!-- 新增工机具 -->
+    <div>
+       <el-form
+      :model="maForm"
+      ref="maForm"
+      size="small"
+      :inline="true"
+      label-width="120px"
+    >
+      <el-form-item label="类型规格" prop="keyWord">
+        <el-input
+          v-model="maForm.keyWord"
+          placeholder="请输入类型规格"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="机具厂家" prop="typeId">
+        <el-select
+          v-model="maForm.typeId"
+          placeholder="请选择机具厂家"
+          clearable
+          filterable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="typeItem in typesList"
+            :key="typeItem.typeId"
+            :label="typeItem.typeName"
+            :value="typeItem.typeId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出厂日期" prop="arrivalTime">
+        <el-date-picker
+          v-model="maForm.arrivalTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+          type="date"
+          placeholder="请选择出厂日期"
+        ></el-date-picker>
+      </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="danger"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleBackAll"
+          >驳回</el-button
+        >
+      </el-col>
+    </el-row>
+
+     <el-table
+      v-loading="loading"
+      :data="equipmentList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column align="center" label="序号" type="index" width="55" />
+      <el-table-column
+        align="center"
+        label="物资名称"
+        prop="materialName"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        label="规格型号"
+        prop="materialModel"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        align="center"
+        label="到货数量"
+        prop="checkNum"
+        show-overflow-tooltip
+      />
+      <el-table-column align="center" label="单位" prop="unitName" />
+      <el-table-column
+        align="center"
+        label="供应商"
+        prop="supplierName"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        align="center"
+        label="出厂日期"
+        prop="productDate"
+        show-overflow-tooltip
+      />
+
+      <el-table-column label="相关配套资料" align="center" prop="checkUrlName">
+        <!-- <template slot-scope="scope">
+            <div @click="openGt(scope.row)" style="color: #02a7f0; cursor: pointer">
+                {{ '报告管理' }}
+            </div>
+            </template> -->
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        label="状态"
+        prop="statusName"
+        show-overflow-tooltip
+      />
+
+      <el-table-column label="操作" align="center" width="300">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-zoom-in"
+            @click="handleView(scope.row)"
+           
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-zoom-in"
+            @click="handleUpload(scope.row)"
+            v-if="scope.row.statusName != '待入库'"
+            >下载</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-close"
+            @click="handleBack(scope.row)"
+            v-if="scope.row.statusName != '待入库'"
+            >驳回</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="maForm.pageNum"
+      :limit.sync="maForm.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 新购查看弹窗 -->
+    <el-dialog
+      :title="titleBind"
+      :visible.sync="showBind"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        :model="queryBind"
+        ref="queryFormBind"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+      </el-form>
+      <el-table
+        v-loading="loadingTwo"
+        :data="getListQr"
+        width="800px"
+        height="600px"
+        @selection-change="handleSelectionChangeQr"
+      >
+        <!-- <el-table-column label="序号" align="center" prop="userName" sortable /> -->
+        <el-table-column
+          label="类型名称"
+          align="center"
+          prop="materialName"
+          sortable
+        />
+        <el-table-column
+          label="规格型号"
+          align="center"
+          prop="materialModel"
+          sortable
+        />
+        <el-table-column
+          label="设备编码"
+          align="center"
+          prop="maCode"
+          sortable
+        />
+        <el-table-column
+          label="绑定人员"
+          align="center"
+          prop="createBy"
+          sortable
+        />
+        <el-table-column
+          label="绑定时间"
+          align="center"
+          prop="createTime"
+          sortable
+        />
+        <el-table-column
+          label="出厂编号"
+          align="center"
+          prop="outFacCode"
+          sortable
+        />
+        <el-table-column
+          label="出厂时间"
+          align="center"
+          prop="productDate"
+          sortable
+        />
+        <el-table-column
+          label="二维码编码"
+          align="center"
+          prop="qrCode"
+
+        >
+        <template slot-scope="scope">
+            <span
+                style="color: blue; cursor: pointer"
+                @click="labelUploadCode(scope.row)"
+            >
+                {{ scope.row.qrCode }}</span
+            >
+        </template>
+         </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryBind.pageNum"
+        :limit.sync="queryBind.pageSize"
+        @pagination="getListQr"
+      />
+    </el-dialog>
+
+    <!-- 绑定查看弹窗 -->
+    <el-dialog
+      :title="titleTwo"
+      :visible.sync="showTwo"
+      width="1100px"
+      append-to-body
+      @close="cancel"
+    >
+      <el-form
+        :model="queryBindTwo"
+        ref="queryFormBind"
+        :rules="queryBindTwoRules"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-form-item label="前缀" label-width="50px" prop="codePrefix">
+          <el-input
+            v-model="queryBindTwo.codePrefix"
+            placeholder="请输入前缀"
+            clearable
+            maxlength="20"
+          />
+        </el-form-item>
+
+        <el-form-item
+          label="后缀起始值"
+          label-width="100px"
+          prop="codeSuffixStart"
+        >
+          <el-input
+            v-model="queryBindTwo.codeSuffixStart"
+            clearable
+            placeholder="请输入后缀起始值"
+            maxlength="99999999"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="mini" @click="handleAdd"
+            >填充</el-button
+          >
+          <el-button type="primary" size="mini" @click="handleBindTwo"
+            >绑定</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="loadingTwo"
+        :data="codeTableList"
+        width="1000px"
+        height="600px"
+      >
+        <el-table-column label="设备名称" align="center" prop="materialName" />
+        <el-table-column label="规格型号" align="center" prop="materialModel" />
+        <el-table-column label="设备编码" align="center" prop="maCode" />
+        <el-table-column label="出厂编号" align="center" prop="outFacCode">
+          <template v-slot:default="{ row }">
+            <el-input
+              v-model="row.outFacCode"
+              placeholder="请输入出厂编码"
+              maxlength="30"
+            ></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="出厂时间" align="center" prop="productDate">
+          <template v-slot:default="{ row }">
+            <el-date-picker
+              v-model="row.productDate"
+              type="date"
+              placeholder="请输入检验时间"
+              style="width: 160px"
+            ></el-date-picker>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="140">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-remove"
+              @click="handleRemove(scope.$index)"
+            >
+              移除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+        <!-- 标签下载对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="uploadOpen"
+            width="450px"
+            append-to-body
+            :close-on-click-modal="false"
+        >
+            <div style="text-align: center" ref="codeBox">
+                <div class="uploadImg">
+                    <div id="qrcode" class="qrcode" ref="codeItem"></div>
+                    <!--        <img src="" alt="">-->
+                </div>
+                <div class="maCode">设备编号：{{ rowObj.maCode }}</div>
+            </div>
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="downloadCode"
+                    >下 载</el-button
+                >
+            </div>
+        </el-dialog>
+        <div style="background-color: transparent" ref="qrCodeAll">
+            <div
+                id="qrCode"
+                v-for="(codeItem, codeIndex) in checkboxModel"
+                :key="codeIndex"
+                class="captureId"
+                v-show="codeId"
+                ref="QrcodePage"
+                style="
+                    z-index: -1111111;
+                    position: absolute;
+                    top: 10px;
+                    left: -99999;
+                    width: 450px;
+                    height: 475px;
+                    background-size: cover;
+                "
+            ></div>
+            <!-- <center style="text-align: center; font-size: 1.5625rem">
+        {{ codeVal }}
+      </center> -->
+        </div>
+    </div>
+
+    
+</template>
+
+<script>
+// import {
+// } from '@/api/store/newBuy'
+// import {
+//   getPurchaseCheckInfo,
+//   equipmentTypeTree,
+//   addPurchaseCheckInfo,
+//   //     getPurchaseCheckInfo,
+//   updatePurchaseCheckInfo,
+// } from "@/api/baseGround/newBuy";
+
+import { getListDetail, getListDetailById,bindAllData,exportNewBuy } from "@/api/purchase/goodsBind";
+import { downloadFile } from '@/utils/download'
+import QRCode from 'qrcodejs2'
+import html2canvas from 'html2canvas'
+import JSZip from 'jszip'
+import FileSaver from 'file-saver'
+// import { getUserByRoleList } from '@/api/system/user'
+// import { equipmentTypeTree, supplierInfoList } from '@/api/store/tools'
+// import Treeselect from '@riophae/vue-treeselect'
+// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+// import HoldingpoleDialog from '@/components/HoldingpoleDialog/index.vue'
+
+// import {} from '@/api/store/newBuy
+
+export default {
+    name: 'BindQrTools',
+    // dicts: ['sys_normal_disable'],
+    // components: { Treeselect, HoldingpoleDialog },
+    props: {
+        editTaskId: {
+        type: [String, Number],
+        default: () => {
+            return "";
+        },
+        },
+    },
+    data() {
+    return {
+      taskId: "",
+      // isEdit: false,
+      // 遮罩层
+      loading: false,
+      loadingTwo: false,
+      typesList:[],
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      num: 0,
+      //机具类型
+      equipmentTypeList: [],
+      // 角色表格数据
+      equipmentList: [],
+      getListQr:[],
+      // 弹出层标题
+      title: "",
+      titleBind: "",
+      titleTwo: "",
+      // 是否显示弹出层
+      open: false,
+      showBind: false,
+      showTwo: false,
+      // 日期范围
+      dateRange: [],
+      queryBind: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      queryBindTwo: {
+        codePrefix: undefined,
+        codeSuffixStart: undefined,
+      },
+      // 查询参数
+      queryParams: {
+        equipmentId: undefined,
+        productionTime: "",
+        supplierId: "",
+      },
+      maForm: {
+        pageNum: 1,
+        pageSize: 10,
+        taskId:undefined,
+      },
+      // 表单参数
+      form: {},
+      materialName: undefined,
+      materialModel: undefined,
+      codeTableList: [],
+      codeTableListTemp: [],
+      productDate: undefined,
+      taskIdTemp:undefined,
+      typeIdTemp:undefined,
+      rowObj:{},
+      labelmaCode: '',
+      uploadOpen: false,
+      qrUrl: this.globalUrl.qrUrl,
+      checkboxModel: [], // 列表复选框
+      qrcodeArr:[],
+      codeId: true,
+      queryBindTwoRules: {
+        codePrefix: [
+          { required: true, message: "请输入前缀", trigger: "blur" },
+        ],
+        codeSuffixStart: [
+          {
+            required: true,
+            message: "请输入后缀起始值",
+            trigger: "blur",
+          },
+          {
+            pattern: /^[1-9][0-9]*$/,
+            message: "请输入大于0且不能以0开头的正整数",
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    pickerOptions() {
+      return {
+        disabledDate(time) {
+          const currentDate = new Date();
+          currentDate.setHours(0, 0, 0, 0);
+          return time.getTime() < currentDate.getTime();
+        },
+      };
+    },
+  },
+  watch: {
+    // 'maForm.purchaseTime'() {
+    //     if (this.maForm.purchaseTime != '') {
+    //         // this.maForm.arrivalTime = ''
+    //     }
+    // },
+  },
+  mounted() {
+    this.taskId = this.editTaskId;
+    this.maForm.taskId = this.taskId;
+    this.getTaskInfo();
+    // this.getUserList()
+    // this.getList();
+    // this.supplierInfoList()
+  },
+  methods: {
+            handleSelectionChangeQr(selection){
+            this.checkboxModel = selection
+            // this.checkboxModel.forEach((item) => {
+            //     item.exportUrl = this.qrUrl + item.qrCode
+            // })
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+            },
+
+            async handleDownloadQr() {
+            this.codeId = true;
+            console.log('checkboxModel', this.checkboxModel)
+            if(this.checkboxModel.length>0){
+                const msg = this.$modal.loading('批量生成中，请稍候...')
+                let that = this
+                try {
+                    let captureId = document.getElementsByClassName('captureId')
+                    for (let i = 0; i < this.checkboxModel.length; i++) {
+                        const element = this.checkboxModel[i]
+                        captureId[i].innerHTML = ''
+                        let shareContent = that.$refs['QrcodePage'][i],
+                            width = shareContent.offsetWidth,
+                            height = shareContent.offsetHeight
+                        const maCodeText = document.createElement('div')
+                        maCodeText.innerHTML = '编码:' + element
+                        maCodeText.style =
+                            'font-size=18px; width:100%;text-align:center;margin:10px;'
+                        shareContent.appendChild(maCodeText)
+                        console.log(element)
+                        new QRCode(captureId[i], {
+                            width: width,
+                            height: height,
+                            text: this.qrUrl + element.qrCode,
+                            colorDark: '#000',
+                            colorLight: '#fff',
+                        })
+                        let canvas = document.createElement('canvas'),
+                            scale = 0.9
+                        canvas.width = width * scale
+                        canvas.height = height * scale
+                        canvas.style.width =
+                            (shareContent.clientWidth * scale) / 100 + 'px'
+                        canvas.style.height =
+                            (shareContent.clientHeight * scale) / 100 + 'px'
+                        canvas.getContext('2d').scale(scale, scale)
+                        let opts = {
+                            scale: scale,
+                            canvas: canvas,
+                            logging: false,
+                            width: width,
+                            height: height,
+                            useCORS: true,
+                        }
+                        await html2canvas(shareContent, opts)
+                            .then(function (canvas) {
+                                const qrContentImage = canvas.toDataURL(
+                                    'image/jpeg',
+                                    1.0,
+                                )
+                                if (i <= that.checkboxModel.length - 1) {
+                                    that.qrcodeArr.push({
+                                        url: qrContentImage,
+                                        name: element,
+                                    })
+                                }
+                            })
+                            .catch(function (reason) {
+                                console.log(reason)
+                                this.$emit('clearCheck')
+                                that.$modal.closeLoading()
+                            })
+                    }
+                    await new Promise((resolve) => setTimeout(resolve, 2000))
+                    that.packageImages()
+                    setTimeout(msg, 1000)
+                    that.$modal.closeLoading()
+                } catch (error) {
+                    setTimeout(msg, 1000)
+                    // that.getList()
+                    this.$emit('clearCheck')
+                    that.$modal.closeLoading()
+                }
+            }else{
+                this.$modal.msgError("请先选择导出设备");
+            }
+            
+        },
+        //打包压缩
+        packageImages() {
+            let that = this
+            const zip = new JSZip()
+            const cache = {}
+            let arr = that.qrcodeArr
+            arr.forEach((item, index) => {
+                let fileName = item.name
+                zip.file(fileName + '.png', item.url.substring(22), {
+                    base64: true,
+                })
+                cache[fileName] = item.url
+            })
+            zip.generateAsync({ type: 'blob' }).then((content) => {
+                FileSaver.saveAs(content, '二维码.zip')
+            })
+            // that.getList()
+            this.$emit('clearCheck')
+            that.qrcodeArr = []
+            that.codeId = false;
+        },
+
+    //二维码查看
+    labelUploadCode(row) {
+            // if (row.maCode == null) {
+            //   this.$message.error('当前设备没有设备编码');
+            //   return
+            // }
+            this.rowObj = row
+            this.uploadOpen = true
+            this.title = '二维码查看'
+            this.labelmaCode = row.qrCode
+            let str = this.qrUrl + row.qrCode
+            console.log('qrUrl',this.qrUrl)
+            console.log('str',str)
+            this.$nextTick(() => {
+                // this.selectionList.forEach((item, index) => {
+                this.$refs.codeItem.innerHTML = ''
+                var qrcode = new QRCode(this.$refs.codeItem, {
+                    text: str, //二维码内容
+                    width: 256,
+                    height: 256,
+                    colorDark: '#000000',
+                    colorLight: '#ffffff',
+                    correctLevel: QRCode.CorrectLevel.H,
+                })
+
+                // });
+            }, 500)
+    },
+
+    downloadCode(e) {
+            if (document.getElementById('qrcode').childNodes[0]) {
+                let element = this.$refs.codeBox
+                html2canvas(element).then((canvas) => {
+                    // 将canvas转换为图片URL
+                    const image = canvas.toDataURL('image/png')
+                    const alink = document.createElement('a')
+                    alink.href = image
+                    alink.download = this.labelmaCode
+                    alink.click()
+                })
+            }
+    },
+    resetQuery(){
+
+    },
+
+    /** 新增按钮操作 */
+    handleBackAll() {},
+
+    //获取任务详情--- 编辑回显数据
+    getTaskInfo() {
+      this.maForm.pageNum = 1;
+      this.getList();
+    },
+
+        //获取任务详情--- 编辑回显数据
+    handleQuery() {
+      this.maForm.pageNum = 1;
+      this.getList();
+    },
+
+    getList(){
+        this.loading = true;
+        getListDetail(this.maForm).then((response) => {
+        this.equipmentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }); 
+    },
+
+
+    //打开查看页面
+    handleView(row) {
+      this.loadingTwo = true;
+      getListDetailById({ taskId: row.taskId, typeId: row.typeId }).then(
+        (response) => {
+          this.getListQr = response.data;
+          this.showBind = true;
+          this.titleBind = "查看";
+          this.loadingTwo = false;
+        }
+      );
+    },
+    //打开绑定页面
+    handleBind(row) {
+      this.queryBindTwo = {};
+      this.resetForm("queryFormBind");
+      this.titleTwo = "绑定";
+      this.showTwo = true;
+      this.num = row.checkNum;
+      this.materialName = row.materialName;
+      this.materialModel = row.materialModel;
+      this.productDate = row.productDate;
+      this.taskIdTemp = row.taskId;
+      this.typeIdTemp = row.typeId;
+    },
+
+    //填充
+    handleAdd() {
+      this.$refs["queryFormBind"].validate((valid) => {
+        if (valid) {
+          this.codeTableList = [];
+          // 设备编码: 前缀 拼接 后缀
+          for (let i = 0; i < this.num; i++) {
+            let suffix = parseInt(this.queryBindTwo.codeSuffixStart) + i;
+            suffix = suffix.toString().padStart(5, "0");
+            console.log("suffix", suffix);
+            suffix = isNaN(suffix) ? "" : suffix;
+            console.log("suffixTwo", suffix);
+            const maCode = `${this.queryBindTwo.codePrefix || ""}${suffix}`;
+            console.log("maCode", maCode);
+            // 出厂编码
+            const outFacCode = "";
+            const materialName = this.materialName;
+            const materialModel = this.materialModel;
+            const productDate = this.productDate;
+            this.codeTableList.push({
+              materialName,
+              materialModel,
+              maCode,
+              outFacCode,
+              productDate,
+            });
+          }
+        }
+      });
+    },
+
+    handleBindTwo(){
+        this.codeTableList.forEach(item=>{
+           this.codeTableListTemp.push({maCode:item.maCode,outFacCode:item.outFacCode,productDate:item.productDate})
+        })
+            bindAllData({taskId:this.taskIdTemp,typeId:this.typeIdTemp,dtoList:this.codeTableListTemp}).then(
+                (response) => {
+                   this.$modal.msgSuccess("绑定成功");
+                    this.getList();
+                    this.showTwo = false
+                    
+                },
+            )
+    },
+
+    handleRemove(index){
+        this.codeTableList.splice(index,1)
+    },
+    
+    cancel() {
+      this.codeTableList = [];
+      this.showTwo = false;
+      this.reset();
+    },
+    reset() {
+      this.resetForm("queryFormBind");
+    },
+
+
+    // 表单重置
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      (this.menuExpand = false),
+        (this.menuNodeAll = false),
+        (this.deptExpand = true),
+        (this.deptNodeAll = false),
+        (this.form = {
+          roleId: undefined,
+          roleName: undefined,
+          roleKey: undefined,
+          roleSort: 0,
+          status: "0",
+          menuIds: [],
+          deptIds: [],
+          menuCheckStrictly: true,
+          deptCheckStrictly: true,
+          remark: undefined,
+        });
+      this.resetForm("form");
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.roleId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      // this.reset();
+      //   this.form = response.data;
+      //   this.open = true;
+    },
+    /** 明细按钮操作 */
+    handleDetail(row) {
+      this.holdingpoleData = row;
+      this.showDialog = true;
+    },
+
+    /** 删除按钮操作 */
+    handleBack(row) {
+      // console.log(row.id)
+      this.$modal
+        .confirm("是否确认删除所选择的数据项？")
+        .then(() => {
+          this.deviceType.forEach((e, index) => {
+            if (e[3] === row.typeId) {
+              this.deviceType.splice(index, 1);
+              this.propsKey++;
+            }
+          });
+          this.equipmentList.forEach((item, index) => {
+            if (item.id == row.id) {
+              this.equipmentList.splice(index, 1);
+            }
+          });
+        })
+        .catch(() => {});
+
+      // const roleIds = row.roleId || this.ids;
+      // this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
+      //   return delRole(roleIds);
+      // }).then(() => {
+      //   this.getList();
+      //   this.$modal.msgSuccess("删除成功");
+      // }).catch(() => {});
+    },
+
+    /** 导出二维码按钮操作 */
+        handleUpload(row) {
+            exportNewBuy({purchaseId:row.purchaseId}).then(res => {
+              downloadFile({ fileName: `二维码_${new Date().getTime()}.zip`, fileData: res, fileType: 'application/zip;charset=utf-8' })
+            })
+          }
+        
+  },
+};
+</script>
+<style lang="scss">
+.uploadImg {
+    padding-top: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.maCode {
+    margin-top: 10px;
+    padding-bottom: 20px;
+    font-size: 18px;
+}
+.popper-select {
+    .el-cascader-panel .el-scrollbar .el-checkbox {
+        display: none;
+    }
+
+    .el-cascader-panel .el-scrollbar:nth-child(4) .el-checkbox {
+        display: block !important;
+    }
+}
+</style>
diff --git a/src/views/material/purchase/goodsBind/component/bindTools.vue b/src/views/material/purchase/goodsBind/component/bindTools.vue
new file mode 100644
index 00000000..eeddb2bb
--- /dev/null
+++ b/src/views/material/purchase/goodsBind/component/bindTools.vue
@@ -0,0 +1,665 @@
+<template>
+  <!-- 新增工机具 -->
+  <div>
+    <el-form
+      :model="maForm"
+      ref="maForm"
+      size="small"
+      :inline="true"
+      label-width="120px"
+    >
+      <el-form-item label="类型规格" prop="keyWord">
+        <el-input
+          v-model="maForm.keyWord"
+          placeholder="请输入类型规格"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item label="机具厂家" prop="typeId">
+        <el-select
+          v-model="maForm.typeId"
+          placeholder="请选择机具厂家"
+          clearable
+          filterable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="typeItem in typesList"
+            :key="typeItem.typeId"
+            :label="typeItem.typeName"
+            :value="typeItem.typeId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出厂日期" prop="arrivalTime">
+        <el-date-picker
+          v-model="maForm.arrivalTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+          type="date"
+          placeholder="请选择出厂日期"
+        ></el-date-picker>
+      </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="danger"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleBackAll"
+          >驳回</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="equipmentList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column align="center" label="序号" type="index" width="55" />
+      <el-table-column
+        align="center"
+        label="物资名称"
+        prop="materialName"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        label="规格型号"
+        prop="materialModel"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        align="center"
+        label="到货数量"
+        prop="checkNum"
+        show-overflow-tooltip
+      />
+      <el-table-column align="center" label="单位" prop="unitName" />
+      <el-table-column
+        align="center"
+        label="供应商"
+        prop="supplierName"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        align="center"
+        label="出厂日期"
+        prop="productDate"
+        show-overflow-tooltip
+      />
+
+      <el-table-column label="相关配套资料" align="center" prop="checkUrlName">
+        <!-- <template slot-scope="scope">
+            <div @click="openGt(scope.row)" style="color: #02a7f0; cursor: pointer">
+                {{ '报告管理' }}
+            </div>
+            </template> -->
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        label="状态"
+        prop="statusName"
+        show-overflow-tooltip
+      />
+
+      <el-table-column label="操作" align="center" width="300">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-zoom-in"
+            @click="handleView(scope.row)"
+            v-if="scope.row.statusName == '待入库'"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-zoom-in"
+            @click="handleBind(scope.row)"
+            v-if="scope.row.statusName != '待入库'"
+            >绑定</el-button
+          >
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-close"
+            @click="handleBack(scope.row)"
+            v-if="scope.row.statusName != '待入库'"
+            >驳回</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="maForm.pageNum"
+      :limit.sync="maForm.pageSize"
+      @pagination="getListPeople"
+    />
+
+    <!-- 新购查看弹窗 -->
+    <el-dialog
+      :title="titleBind"
+      :visible.sync="showBind"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        :model="queryBind"
+        ref="queryFormBind"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+      </el-form>
+      <el-table
+        v-loading="loadingTwo"
+        :data="getListPeople"
+        width="800px"
+        height="600px"
+      >
+        <!-- <el-table-column label="序号" align="center" prop="userName" sortable /> -->
+        <el-table-column
+          label="类型名称"
+          align="center"
+          prop="materialName"
+          sortable
+        />
+        <el-table-column
+          label="规格型号"
+          align="center"
+          prop="materialModel"
+          sortable
+        />
+        <el-table-column
+          label="设备编码"
+          align="center"
+          prop="maCode"
+          sortable
+        />
+        <el-table-column
+          label="绑定人员"
+          align="center"
+          prop="createBy"
+          sortable
+        />
+        <el-table-column
+          label="绑定时间"
+          align="center"
+          prop="createTime"
+          sortable
+        />
+        <el-table-column
+          label="出厂编号"
+          align="center"
+          prop="outFacCode"
+          sortable
+        />
+        <el-table-column
+          label="出厂时间"
+          align="center"
+          prop="productDate"
+          sortable
+        />
+      </el-table>
+
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryBind.pageNum"
+        :limit.sync="queryBind.pageSize"
+        @pagination="getListPeople"
+      />
+    </el-dialog>
+
+    <!-- 绑定查看弹窗 -->
+    <el-dialog
+      :title="titleTwo"
+      :visible.sync="showTwo"
+      width="1100px"
+      append-to-body
+      @close="cancel"
+    >
+      <el-form
+        :model="queryBindTwo"
+        ref="queryFormBind"
+        :rules="queryBindTwoRules"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-form-item label="前缀" label-width="50px" prop="codePrefix">
+          <el-input
+            v-model="queryBindTwo.codePrefix"
+            placeholder="请输入前缀"
+            clearable
+            maxlength="20"
+          />
+        </el-form-item>
+
+        <el-form-item
+          label="后缀起始值"
+          label-width="100px"
+          prop="codeSuffixStart"
+        >
+          <el-input
+            v-model="queryBindTwo.codeSuffixStart"
+            clearable
+            placeholder="请输入后缀起始值"
+            maxlength="99999999"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="mini" @click="handleAdd"
+            >填充</el-button
+          >
+          <el-button type="primary" size="mini" @click="handleBindTwo"
+            >绑定</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="loadingTwo"
+        :data="codeTableList"
+        width="1000px"
+        height="600px"
+      >
+        <el-table-column label="设备名称" align="center" prop="materialName" />
+        <el-table-column label="规格型号" align="center" prop="materialModel" />
+        <el-table-column label="设备编码" align="center" prop="maCode" />
+        <el-table-column label="出厂编号" align="center" prop="outFacCode">
+          <template v-slot:default="{ row }">
+            <el-input
+              v-model="row.outFacCode"
+              placeholder="请输入出厂编码"
+              maxlength="30"
+            ></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="出厂时间" align="center" prop="productDate">
+          <template v-slot:default="{ row }">
+            <el-date-picker
+              v-model="row.productDate"
+              type="date"
+              placeholder="请输入检验时间"
+              style="width: 160px"
+            ></el-date-picker>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="140">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="danger"
+              icon="el-icon-remove"
+              @click="handleRemove(scope.$index)"
+            >
+              移除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import {
+// } from '@/api/store/newBuy'
+import {
+  getPurchaseCheckInfo,
+  equipmentTypeTree,
+  addPurchaseCheckInfo,
+  //     getPurchaseCheckInfo,
+  updatePurchaseCheckInfo,
+} from '@/api/purchase/goodsArrived';
+
+import { getListDetail, getListDetailById,bindAllData } from '@/api/purchase/goodsBind';
+// import { getUserByRoleList } from '@/api/system/user'
+// import { equipmentTypeTree, supplierInfoList } from '@/api/store/tools'
+// import Treeselect from '@riophae/vue-treeselect'
+// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+// import HoldingpoleDialog from '@/components/HoldingpoleDialog/index.vue'
+
+// import {} from '@/api/store/newBuy'
+
+export default {
+  name: "BindTools",
+  dicts: ["sys_normal_disable"],
+  // components: { Treeselect, HoldingpoleDialog },
+  props: {
+    editTaskId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+  },
+  data() {
+    return {
+      taskId: "",
+      // isEdit: false,
+      // 遮罩层
+      loading: false,
+      loadingTwo: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      num: 0,
+      //机具类型
+      equipmentTypeList: [],
+      // 角色表格数据
+      equipmentList: [],
+      // 弹出层标题
+      title: "",
+      titleBind: "",
+      titleTwo: "",
+      // 是否显示弹出层
+      open: false,
+      showBind: false,
+      showTwo: false,
+      // 日期范围
+      dateRange: [],
+      queryBind: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      queryBindTwo: {
+        codePrefix: undefined,
+        codeSuffixStart: undefined,
+      },
+      // 查询参数
+      queryParams: {
+        equipmentId: undefined,
+        productionTime: "",
+        supplierId: "",
+      },
+      maForm: {
+        pageNum: 1,
+        pageSize: 10,
+        taskId:undefined,
+      },
+      // 表单参数
+      form: {},
+      materialName: undefined,
+      materialModel: undefined,
+      codeTableList: [],
+      codeTableListTemp: [],
+      productDate: undefined,
+      taskIdTemp:undefined,
+      typeIdTemp:undefined,
+      queryBindTwoRules: {
+        codePrefix: [
+          { required: true, message: "请输入前缀", trigger: "blur" },
+        ],
+        codeSuffixStart: [
+          {
+            required: true,
+            message: "请输入后缀起始值",
+            trigger: "blur",
+          },
+          {
+            pattern: /^[1-9][0-9]*$/,
+            message: "请输入大于0且不能以0开头的正整数",
+          },
+        ],
+      },
+    };
+  },
+  computed: {
+    pickerOptions() {
+      return {
+        disabledDate(time) {
+          const currentDate = new Date();
+          currentDate.setHours(0, 0, 0, 0);
+          return time.getTime() < currentDate.getTime();
+        },
+      };
+    },
+  },
+  watch: {
+    // 'maForm.purchaseTime'() {
+    //     if (this.maForm.purchaseTime != '') {
+    //         // this.maForm.arrivalTime = ''
+    //     }
+    // },
+  },
+  mounted() {
+    this.taskId = this.editTaskId;
+    this.maForm.taskId = this.taskId;
+    this.getTaskInfo();
+    // this.getUserList()
+    // this.getList();
+    // this.supplierInfoList()
+  },
+  methods: {
+    /** 新增按钮操作 */
+    handleBackAll() {},
+
+    //获取任务详情--- 编辑回显数据
+    getTaskInfo() {
+      this.maForm.pageNum = 1;
+      this.getList();
+    },
+
+        //获取任务详情--- 编辑回显数据
+    handleQuery() {
+      this.maForm.pageNum = 1;
+      this.getList();
+    },
+
+    getList(){
+        this.loading = true;
+        getListDetail(this.maForm).then((response) => {
+        this.equipmentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }); 
+    },
+
+    //打开查看页面
+    handleView(row) {
+      this.loadingTwo = true;
+      getListDetailById({ taskId: row.taskId, typeId: row.typeId }).then(
+        (response) => {
+          this.getListBind = response.rows;
+          this.showBind = true;
+          this.titleBind = "查看";
+          this.loadingTwo = false;
+        }
+      );
+    },
+    //打开绑定页面
+    handleBind(row) {
+      this.queryBindTwo = {};
+      this.resetForm("queryFormBind");
+      this.titleTwo = "绑定";
+      this.showTwo = true;
+      this.num = row.checkNum;
+      this.materialName = row.materialName;
+      this.materialModel = row.materialModel;
+      this.productDate = row.productDate;
+      this.taskIdTemp = row.taskId;
+      this.typeIdTemp = row.typeId;
+    },
+
+    //填充
+    handleAdd() {
+      this.$refs["queryFormBind"].validate((valid) => {
+        if (valid) {
+          this.codeTableList = [];
+          // 设备编码: 前缀 拼接 后缀
+          for (let i = 0; i < this.num; i++) {
+            let suffix = parseInt(this.queryBindTwo.codeSuffixStart) + i;
+            suffix = suffix.toString().padStart(5, "0");
+            console.log("suffix", suffix);
+            // console.log('🚀 ~ fillCodeForm ~ suffix:', suffix);
+            suffix = isNaN(suffix) ? "" : suffix;
+            console.log("suffixTwo", suffix);
+            const maCode = `${this.queryBindTwo.codePrefix || ""}${suffix}`;
+            console.log("maCode", maCode);
+            // 出厂编码
+            const outFacCode = "";
+            const materialName = this.materialName;
+            const materialModel = this.materialModel;
+            const productDate = this.productDate;
+            // const productDate = this.queryBindTwo.productDate
+            this.codeTableList.push({
+              materialName,
+              materialModel,
+              maCode,
+              outFacCode,
+              productDate,
+            });
+          }
+        }
+      });
+    },
+
+    handleBindTwo(){
+        this.codeTableList.forEach(item=>{
+           this.codeTableListTemp.push({maCode:item.maCode,outFacCode:item.outFacCode,productDate:item.productDate})
+        })
+            bindAllData({taskId:this.taskIdTemp,typeId:this.typeIdTemp,dtoList:this.codeTableListTemp}).then(
+                (response) => {
+                   this.$modal.msgSuccess("绑定成功");
+                    this.getList();
+                    this.showTwo = false
+                    
+                },
+            )
+    },
+
+    handleRemove(index){
+        this.codeTableList.splice(index,1)
+    },
+    
+    cancel() {
+      this.codeTableList = [];
+      this.showTwo = false;
+      this.reset();
+    },
+    reset() {
+      this.resetForm("queryFormBind");
+    },
+
+
+    // 表单重置
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      (this.menuExpand = false),
+        (this.menuNodeAll = false),
+        (this.deptExpand = true),
+        (this.deptNodeAll = false),
+        (this.form = {
+          roleId: undefined,
+          roleName: undefined,
+          roleKey: undefined,
+          roleSort: 0,
+          status: "0",
+          menuIds: [],
+          deptIds: [],
+          menuCheckStrictly: true,
+          deptCheckStrictly: true,
+          remark: undefined,
+        });
+      this.resetForm("form");
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.roleId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      // this.reset();
+      //   this.form = response.data;
+      //   this.open = true;
+    },
+    /** 明细按钮操作 */
+    handleDetail(row) {
+      this.holdingpoleData = row;
+      this.showDialog = true;
+    },
+
+    /** 删除按钮操作 */
+    handleBack(row) {
+      // console.log(row.id)
+      this.$modal
+        .confirm("是否确认删除所选择的数据项？")
+        .then(() => {
+          this.deviceType.forEach((e, index) => {
+            if (e[3] === row.typeId) {
+              this.deviceType.splice(index, 1);
+              this.propsKey++;
+            }
+          });
+          this.equipmentList.forEach((item, index) => {
+            if (item.id == row.id) {
+              this.equipmentList.splice(index, 1);
+            }
+          });
+        })
+        .catch(() => {});
+
+      // const roleIds = row.roleId || this.ids;
+      // this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
+      //   return delRole(roleIds);
+      // }).then(() => {
+      //   this.getList();
+      //   this.$modal.msgSuccess("删除成功");
+      // }).catch(() => {});
+    },
+  },
+};
+</script>
+<style lang="scss">
+.popper-select {
+  .el-cascader-panel .el-scrollbar .el-checkbox {
+    display: none;
+  }
+
+  .el-cascader-panel .el-scrollbar:nth-child(4) .el-checkbox {
+    display: block !important;
+  }
+}
+</style>
diff --git a/src/views/material/purchase/goodsBind/component/home.vue b/src/views/material/purchase/goodsBind/component/home.vue
new file mode 100644
index 00000000..ff3b6c96
--- /dev/null
+++ b/src/views/material/purchase/goodsBind/component/home.vue
@@ -0,0 +1,575 @@
+<template>
+    <div>
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="50px"
+        >
+            <el-form-item  label="日期">
+                <el-date-picker
+                v-model="queryParams.dateRange"
+                style="width: 240px"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                ></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="设备状态" prop="status" label-width="100px">
+                <el-select
+                    v-model="queryParams.status"
+                    placeholder="请选择设备状态"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="typeItem in typesList"
+                        :key="typeItem.typeId"
+                        :label="typeItem.typeName"
+                        :value="typeItem.typeId"
+                    />
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="关键字" prop="keyWord" label-width="100px">
+                <el-input
+                    v-model="queryParams.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    maxlength="50"
+                    style="width: 240px"
+                    @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="warning"
+                    plain
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleExport"
+                    >导出数据</el-button
+                >
+            </el-col>
+            <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+            ></right-toolbar>
+        </el-row>
+
+        <el-table
+            v-loading="loading"
+            :data="bindList"
+            @selection-change="handleSelectionChange"
+            border
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column
+                align="center"
+                label="序号"
+                type="index"
+            />
+            <el-table-column
+                align="center"
+                label="到货时间"
+                prop="arrivalTime"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购单号"
+                align="center"
+                prop="purchaseCode"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购物资"
+                align="center"
+                prop="purchaseMaterial"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="采购数量"
+                align="center"
+                prop="purchaseNum"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="创建人"
+                align="center"
+                prop="createBy"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="创建时间"
+                align="center"
+                prop="createTime"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="状态"
+                align="center"
+                prop="statusName"
+                :show-overflow-tooltip="true"
+            >
+            </el-table-column>
+
+            <el-table-column
+                label="备注"
+                align="center"
+                prop="remark"
+                :show-overflow-tooltip="true"
+            />
+            
+            <el-table-column label="操作" align="center" width="400">
+                <template slot-scope="scope">
+                    <el-button
+                        size="mini"
+                        type="primary"
+                        icon="el-icon-zoom-in"
+                        @click="handleView(scope.row)"
+                        >查看</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="warning"
+                        icon="el-icon-paperclip"
+                        @click="handleBind(scope.row)"
+                        v-hasPermi="['newPurchase:tools:edit']"
+                        >编码绑定</el-button
+                    >
+
+                    <el-button
+                        size="mini"
+                        type="danger"
+                        icon="el-icon-close"
+                        @click="handleNotice(scope.row)"
+                        v-if="scope.row.statusName != '已驳回'"
+                        >驳回</el-button
+                    > 
+                    <el-button
+                        size="mini"
+                        type="success"
+                        icon="success"
+                        @click="handleBindQr(scope.row)"
+                        >二维码绑定</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="titleBind" :visible.sync="showBind" width="1000px" append-to-body >
+          <el-form :model="queryBind" ref="queryFormBind" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          </el-form>
+      <el-table v-loading="loadingTwo" :data="getListBind" width="800px" height = "600px" >
+        <el-table-column label="序号" align="center" width="80" type="index">
+        <template slot-scope="scope">
+          <span>{{ (queryBind.pageNum - 1) * queryBind.pageSize + scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+        <el-table-column label="类型名称" align="center" prop="materialName" sortable/>
+        <el-table-column label="规格型号" align="center" prop="materialModel" sortable/>
+        <el-table-column label="设备编码" align="center" prop="maCode" sortable/>
+        <el-table-column label="绑定人员" align="center" prop="createBy" sortable/>
+        <el-table-column label="绑定时间" align="center" prop="createTime" sortable/>
+        <el-table-column label="出厂编号" align="center" prop="outFacCode" sortable/>
+        <el-table-column label="出厂时间" align="center" prop="productDate" sortable/>
+
+      </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryBind.pageNum"
+            :limit.sync="queryBind.pageSize"
+            @pagination="getListBind"
+        />
+      </el-dialog>
+
+    </div>
+</template>
+
+<script>
+import {
+    getListNewBuy,
+    getPurchaseCheckInfo,
+    getAcceptanceForm,
+    purchaseCheckInfoRemove,
+    getNoticePeople,
+    getUserAll,
+    addNoticeUser,
+    bmNoticeInfo,
+} from '@/api/purchase/goodsArrived'
+import {
+    getListNewBuyBind,
+    getListDetail,
+} from '@/api/purchase/goodsBind'
+// import {
+//     getRepairedList,
+//     getRepairedDetailList,
+//     inputByType,
+//     getTypeList,
+// } from '@/api/store/warehousing'
+// import vueEasyPrint from 'vue-easy-print'
+// import { getLeaseAuditListAll } from '@/api/claimAndRefund/receive'
+
+export default {
+    name: 'Home',
+    // dicts: ['sys_normal_disable'],
+    // components: { vueEasyPrint },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            loadingTwo: true,
+            updateTime:"",
+            // 日期范围
+            dateRange: [],
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            showBind: false,
+            peopleOpen: false,
+            // 总条数
+            total: 0,
+            totalTwo: 0,
+            //搜索下拉数据
+            typesList: [],
+            modelList: [],
+            // 字典表格数据
+            bindList: [],
+            getListBind:[],
+            configUserList: [],
+            phoneNumbers:[],
+            //选择人员
+            chosenUserList: [],
+            userList: [],
+            // 弹出层标题
+            title: '',
+            titleBind: '',
+            // 日期范围
+            dateRange: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                time: null, //申请时间
+                name: undefined,
+                typeId: '',
+                keyWord: '',
+            },
+            queryBind: {
+                pageNum: 1,
+                pageSize: 10,
+            },
+            openPrint: false,
+            printData: {},
+            printTableData: [],
+            // 供应商
+            supplierStr: '',
+        }
+    },
+    created() {
+        this.getList()
+        // this.getTypeList()
+    },
+    methods: {
+        // 多选框选中-添加人员
+        handleSelectionUser(selection) {
+            // console.log(selection)
+            this.chosenUserList = selection
+        },
+
+        // getTypeList() {
+        //     getTypeList({ level: '3' }).then((response) => {
+        //         this.typesList = response.data
+        //     })
+        //     getTypeList({ level: '4' }).then((response) => {
+        //         this.modelList = response.data
+        //     })
+        // },
+
+        getList() {
+            this.loading = true
+            const params = {
+                keyWord: this.queryParams.keyWord,
+                startTime: this.queryParams.dateRange && this.queryParams.dateRange[0],
+                endTime: this.queryParams.dateRange && this.queryParams.dateRange[1],
+                status: this.queryParams.status,
+                pageSize: this.queryParams.pageSize,
+                pageNum: this.queryParams.pageNum,
+            }
+            getListNewBuyBind(this.addDateRange(params)).then(
+                (response) => {
+                    this.bindList = response.rows
+                    this.total = response.total
+                    this.loading = false
+                },
+            )
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams.time = []
+            this.resetForm('queryForm')
+            this.queryParams.keyWord = ''
+            this.handleQuery()
+        },
+        // /** 新增按钮操作 */
+        // handleAdd() {
+        //     this.$emit('addTools')
+        // },
+        /** 查看按钮操作 */
+        handleView(row) {
+            this.loadingTwo = true;
+           getListDetail({taskId: row.taskId}).then((response) => {
+                this.getListBind = response.rows;
+                this.showBind = true
+                this.titleBind = "查看"
+                this.loadingTwo = false
+            })
+        },
+        /** 编码绑定按钮操作 */
+        handleBind(row) {
+            this.$emit('bindTools', row.taskId)
+        },
+
+        /** 编码绑定按钮操作 */
+        handleBindQr(row) {
+            this.$emit('bindQrTools', row.taskId)
+        },
+
+        //----消息通知
+        getNowTime() {
+            var today = new Date()
+            var year = today.getFullYear() //获取年份
+            var month = today.getMonth() + 1 //获取月份
+            var day = today.getDate() //获取日期
+            return year + '-' + month + '-' + day
+        },
+
+        handleNotice(row){
+          this.reset()
+          this.showBind = true;
+          const taskId = row.taskId;
+            getNoticePeople({taskId: taskId}).then((response) => {
+                this.getListBind = response.rows;
+                this.showBind = true
+                this.loadingTwo = false
+                this.title = '通知'
+            })
+        },
+
+        addUserOpen() {
+            this.getAllUserList()
+            this.peopleOpen = true
+        },
+
+        //确认消息通知
+        configNotice() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    this.configUserList.forEach((item, index) => {
+                        item.telphone = item.telphone
+                        item.remark = this.form.remark
+                        this.phoneNumbers.push(item.telphone)
+                    })
+                    let param = {
+                        phoneNumbers: this.phoneNumbers,
+                        content: this.form.remark,
+                    }
+                    if (this.configUserList.length > 0) {
+                        bmNoticeInfo(param).then((response) => {
+                            console.log(response)
+                            if (response.code == 200) {
+                                this.$message({
+                                    message: '操作成功',
+                                    type: 'success',
+                                })
+                                this.noticeOpen = false
+                                this.getTaskInfo()
+                            }
+                        })
+                    } else {
+                        this.$message({
+                            message: '请选择通知人员！',
+                            type: 'error',
+                        })
+                    }
+                }
+            })
+        },
+
+        // 人员取消按钮
+        cancel() {
+            this.showBind = false;
+            this.reset();
+        },
+
+        // 表单重置 
+        reset() {
+            this.form = {};
+            this.resetForm("form");
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.taskId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+
+        /** 验收按钮 */
+        handleAccept(row) {
+            // let query = { taskId: row.taskId }
+            // this.$tab.closeOpenPage({
+            //     path: '/store/newBuy/newDevicesAccept',
+            //     query,
+            // })
+            this.$emit('acceptTools', row.taskId)
+        },
+        //编码管理
+        handleCode(row) {
+            // let query = { taskId: row.taskId }
+            // this.$tab
+            //     .closeOpenPage({
+            //         path: '/store/newBuy/newDevicesCode',
+            //         query,
+            //     })
+            //     .then(() => {
+            //         this.$tab.refreshPage()
+            //     })
+            this.$emit('codingTools', row.taskId)
+        },
+
+        //获取验收单数据
+        getPrintTable(taskId) {
+            getAcceptanceForm({ taskId: taskId }).then((response) => {
+                this.printData = response.data
+                this.printTableData = response.data.checkDetailsList
+
+                let supplierList = []
+                this.printTableData.forEach((e) => {
+                    if (e.supplier) {
+                        supplierList.push(e.supplier)
+                    }
+                })
+                supplierList = [...new Set(supplierList)]
+
+                this.supplierStr = supplierList.join(',')
+            })
+        },
+        //查看验收单
+        handlePrint(row) {
+            // this.query.taskId = row.taskId
+            // this.getPrintTable(row.taskId)
+            this.openPrint = true
+            this.title = '机具设备到货验收单'
+        },
+        //打印
+        print() {
+            this.$refs.remarksPrintRef.print()
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            // console.log(row)
+            const taskIds = row.taskId || this.ids
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return purchaseCheckInfoRemove(taskIds)
+                })
+                .then(() => {
+                    this.getList()
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+
+        handleDeletePeople(row){
+            const ids = row.id
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(function () {
+                    return deletePeople(ids)
+                })
+                .then(() => {
+                    this.handleNotice(row)
+                    this.$modal.msgSuccess('删除成功')
+                })
+                .catch(() => {})
+        },
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'material/purchase_check_info/export',
+                {
+                    ...this.queryParams,
+                },
+                `新购工机具验收_${new Date().getTime()}.xlsx`,
+            )
+        },
+    watch: {
+        $route: {
+            handler(to) {
+                if (to.query.keyWord) {
+                    this.queryParams.keyWord = to.query.keyWord
+                }
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+    width: 70px !important;
+    margin-bottom: 10px;
+}
+</style>
diff --git a/src/views/material/purchase/goodsBind/index.vue b/src/views/material/purchase/goodsBind/index.vue
new file mode 100644
index 00000000..164d83e9
--- /dev/null
+++ b/src/views/material/purchase/goodsBind/index.vue
@@ -0,0 +1,79 @@
+<template>
+  <!-- 新购验收绑定 -->
+  <div class="app-container">
+    <PageHeader
+      v-if="isShowComponent != 'Home'"
+      :pageContent="pageContent"
+      @goBack="goBack"
+    />
+    <component 
+            :is="isShowComponent" 
+            :isEdit="isEdit"
+            :editTaskId="editTaskId"
+            :queryTaskId="queryTaskId"
+            :isView="isView"
+            :codingTaskId="codingTaskId"
+            @bindTools="bindTools"
+            @bindQrTools="bindQrTools"
+            @addToolsSuccess="addToolsSuccess"
+    />
+  </div>
+</template>
+  
+<script>
+import PageHeader from "@/components/pageHeader";
+import Home from "./component/home.vue"; // 主列表
+import BindTools from './component/bindTools.vue' // 编码绑定
+import BindQrTools from './component/bindQrTools.vue' // 二维码绑定
+export default {
+  components: {
+    Home,
+    PageHeader,
+    BindTools,
+    BindQrTools,
+  },
+  data() {
+    return {
+      isShowComponent: "Home",
+      pageContent: "新增机具",
+      isEdit: false,
+      editTaskId: "",
+      queryTaskId: "",
+      isView: false,
+      codingTaskId: "",
+    };
+  },
+
+  methods: {
+      /* 编码绑定 */
+      bindTools(taskId) {
+          this.editTaskId = taskId
+          this.queryTaskId = ''
+          this.pageContent = '编码绑定'
+          this.isShowComponent = 'BindTools'
+      },
+      /* 新增成功 */
+      addToolsSuccess() {
+          this.isShowComponent = 'Home'
+      },
+      /* 二维码绑定 */
+      bindQrTools(taskId) {
+            this.pageContent = '二维码绑定'
+            this.editTaskId = taskId
+            this.isShowComponent = 'BindQrTools'
+        },
+      /* 编辑工机具 */
+      editTools(id) {
+            this.isEdit = true
+            this.pageContent = '编辑机具'
+            this.editTaskId = id
+            this.isShowComponent = 'BindTools'
+        },
+
+    /* 返回按钮 */
+    goBack() {
+      this.isShowComponent = "Home";
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/qrCode/qrCode.vue b/src/views/qrCode/qrCode.vue
new file mode 100644
index 00000000..d705acb8
--- /dev/null
+++ b/src/views/qrCode/qrCode.vue
@@ -0,0 +1,226 @@
+<template>
+    <div style="width: 100%">
+        <div style="width: 100%; padding: 10px">
+            <div class="item-box">
+                <div>设备类型:</div>
+                <div style="margin-left: 10px; color: blue">{{
+                    queryParams.deviceType
+                }}</div>
+            </div>
+            <div class="item-box">
+                <div>规格型号:</div>
+                <div style="margin-left: 10px">
+                    {{ queryParams.specificationType }}</div
+                >
+            </div>
+            <div class="item-box">
+                <div>二维码编码:</div>
+                <div style="margin-left: 10px">{{ queryParams.qrCode }}</div>
+            </div>
+            <div class="item-box">
+                <div>设备编码:</div>
+                <div style="margin-left: 10px">{{ queryParams.maCode }}</div>
+            </div>
+            <div class="item-box">
+                <div>设备状态:</div>
+                <div style="margin-left: 10px">{{
+                    queryParams.maStatusName
+                }}</div>
+            </div>
+            <!-- <div class="item-box">
+            <div >本次检修人员:</div>
+            <div style="margin-left: 10px;">{{queryParams.checkMan}}</div>
+          </div>   -->
+            <div class="item-box">
+                <div>本次检修时间:</div>
+                <div style="margin-left: 10px; color: blue">{{
+                    queryParams.thisCheckTime
+                }}</div>
+            </div>
+            <div class="item-box">
+                <div>下次检修时间:</div>
+                <div style="margin-left: 10px; color: blue">{{
+                    queryParams.nextCheckTime
+                }}</div>
+            </div>
+            <div class="item-box">
+                <div>检验人员:</div>
+                <div style="margin-left: 10px">{{ queryParams.checkMan }}</div>
+            </div>
+            <div class="item-box">
+                <div>检验结论:</div>
+                <div style="margin-left: 10px; color: blue">{{
+                    queryParams.inspectStatus || '合格'
+                }}</div>
+            </div>
+            <div class="item-box">
+                <div>联系电话:</div>
+                <div style="margin-left: 10px">{{ queryParams.phone }}</div>
+            </div>
+            <div class="item-box">
+                <div>生产厂家:</div>
+                <div style="margin-left: 10px">{{ queryParams.maVender }}</div>
+            </div>
+            <div class="item-box">
+                <div>出厂日期:</div>
+                <div style="margin-left: 10px">{{
+                    queryParams.outFacTime
+                }}</div>
+            </div>
+            <div class="item-box">
+                <div>出入库次数:</div>
+                <div style="margin-left: 10px">{{ queryParams.inOutNum }}</div>
+            </div>
+            <div class="item-box">
+                <div>领料单位:</div>
+                <div style="margin-left: 10px"
+                    >{{ queryParams.leaseUnit }}
+                </div>
+            </div>
+            <div class="item-box">
+                <div>领料工程:</div>
+                <div style="margin-left: 10px">{{ queryParams.leasePro }} </div>
+            </div>
+            <div class="item-box">
+                <div>领料时间:</div>
+                <div style="margin-left: 10px"
+                    >{{ queryParams.leaseTime }}
+                </div>
+            </div>
+            <div class="item-box">
+                <div>退料单位:</div>
+                <div style="margin-left: 10px">{{ queryParams.backUnit }} </div>
+            </div>
+            <div class="item-box">
+                <div>退料工程:</div>
+                <div style="margin-left: 10px">{{ queryParams.backPro }} </div>
+            </div>
+            <div class="item-box">
+                <div>退料时间:</div>
+                <div style="margin-left: 10px">{{ queryParams.backTime }} </div>
+            </div>
+        </div>
+        <div class="bottom-box">
+            <div
+                style="
+                    width: 100%;
+                    text-align: center;
+                    margin-bottom: 20px;
+                    color: green;
+                    margin-top: 10px;
+                "
+            >
+                检 验 合 格 证
+            </div>
+            <div style="width: 50%; display: flex; margin-bottom: 10px">
+                <div style="color: green">名 称：</div>
+                <div style="border-bottom: 1px solid green">{{
+                    queryParams.deviceType
+                }}</div>
+            </div>
+            <div style="width: 50%; display: flex; margin-bottom: 10px">
+                <div style="color: green">检验结论：</div>
+                <div style="color: red; font-size: 18px; font-weight: 600">{{
+                    queryParams.inspectStatus || '合格'
+                }}</div>
+            </div>
+            <div style="width: 100%; display: flex; margin-bottom: 10px">
+                <div style="color: green">型 号：</div>
+                <div style="border-bottom: 1px solid green">{{
+                    queryParams.specificationType
+                }}</div>
+            </div>
+            <div style="width: 100%; display: flex; margin-bottom: 10px">
+                <div style="color: green">编 号：</div>
+                <div style="border-bottom: 1px solid green">{{
+                    queryParams.maCode
+                }}</div>
+            </div>
+            <div style="width: 100%; display: flex; margin-bottom: 10px">
+                <div style="color: green">本次检验日期：</div>
+                <div style="border-bottom: 1px solid green">{{
+                    queryParams.thisCheckTime
+                }}</div>
+            </div>
+            <div style="width: 100%; display: flex; margin-bottom: 10px">
+                <div style="color: green">下次检验日期：：</div>
+                <div style="border-bottom: 1px solid green">{{
+                    queryParams.nextCheckTime
+                }}</div>
+            </div>
+            <div style="position: absolute; top: 0%; left: 25%">
+                <canvas id="canvas" width="180" height="180"></canvas>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import chapter from '../../utils/chapter'
+import { getMachineByQrCode } from '@/api/basic/basic'
+export default {
+    data() {
+        return {
+            qrCode: '',
+            queryParams: {
+                deviceType: '', //设备类型
+                specificationType: '', //规格型号
+                qrCode: '', //二维码
+                maCode: '', //设备编码
+                maStatusName: '', //设备状态
+                checkMan: '', //本次检验人
+                thisCheckTime: '', //本次检验日期
+                nextCheckTime: '', //下次检验日期
+                // maStatusName:'',//设备状态
+                inspectMan: '', //检验人员
+                inspectStatus: '', //检验结论
+                phone: '', //联系电话
+                maVender: '', //厂家名称
+                outFacTime: '', //出厂日期
+                inOutNum: '', //出入库次数
+                leaseUnit: '', // 领料单位
+                leasePro: '', // 领料工程
+                leaseTime: '', // 领料时间
+                backUnit: '', //  退料单位
+                backPro: '', // 退料工程
+                backTime: '', // 退料时间
+            },
+        }
+    },
+    created() {
+        this.qrCode = this.$route.query.qrCode
+        // console.log(this.qrCode)
+        this.getMachineByQrCode()
+    },
+    mounted() {
+        chapter('机具检验专用章', '重庆送变电工程有限公司')
+    },
+    methods: {
+        getMachineByQrCode() {
+            let param = {
+                qrCode: this.qrCode,
+            }
+            getMachineByQrCode(param).then((response) => {
+                console.log(response, '返回结果-----')
+                this.queryParams = response.data
+            })
+        },
+    },
+}
+</script>
+<style lang="scss" scoped>
+.item-box {
+    display: flex;
+    width: 100%;
+    border-bottom: 1px solid green;
+    margin-bottom: 10px;
+}
+.bottom-box {
+    display: flex;
+    width: 99%;
+    border: 4px solid rgb(2, 196, 2);
+    flex-wrap: wrap;
+    margin: auto;
+    position: relative;
+}
+</style>