From 0cdc57667938b258d597b1e98f4ec7db5ed1d1d5 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Wed, 6 Mar 2024 16:34:34 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=8E=9F=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hw/mes/api/domain/MesBaseBarcodeInfo.java |  12 +-
 .../hw/common/core/constant/MesConstants.java |   8 +-
 .../com/hw/common/core/utils/uuid/Seq.java    |  22 +
 .../impl/MesBaseBarcodeInfoServiceImpl.java   |  49 +-
 hw-ui/src/api/mes/barcode.js                  |   8 +
 hw-ui/src/views/mes/barcode/index.vue         | 452 ++++++++++--------
 .../mes/purchaseOrder/addPurchaseOrder.vue    |  51 +-
 7 files changed, 350 insertions(+), 252 deletions(-)

diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java
index 8b73db97..cb234d51 100644
--- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java
+++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseBarcodeInfo.java
@@ -80,18 +80,18 @@ public class MesBaseBarcodeInfo extends BaseEntity
     private String poNo;
 
     /** 生产日期;打印时根据领料单选择输入 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date productionDate;
 
     /** 接受日期;打印时的系统日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "接受日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "接受日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date acceptedDate;
 
     /** 最晚出库日期;可以直接输入，也可以根据日限计算 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "最晚出库日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最晚出库日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date lastOutstockDate;
 
     /** 生产计划编号，关联mes_pd_product_plan的plan_code;适合生产出入库等 */
diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java
index bc67fa41..ea62d1d8 100644
--- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java
+++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java
@@ -15,10 +15,16 @@ public class MesConstants {
     public static final String MES_BARCODE_TYPE_PRODUCT = "3";//成品
     public static final String MES_BARCODE_TYPE_BACKPLATE = "4";//背板
 
+    /** 条码批次标识；0-否 */
+    public static final String NOT_IS_BATCH = "0";
+
+    /** 条码批次标识；1-是 */
+    public static final String IS_BATCH = "1";
+
     /** 工单状态；0-待发布 */
     public static final String UN_PUBLISH = "0";
 
-    /** 工单状态；0-已发布 */
+    /** 工单状态；1已发布 */
     public static final String PUBLISHED = "1";
 
     /** 工单状态；2-已完成 */
diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java
index c53c3144..a948286d 100644
--- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java
+++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/utils/uuid/Seq.java
@@ -80,6 +80,24 @@ public class Seq {
     // 生产计划明细标识
     public static final String mesProductPlanDetailCode = "PD";
 
+    // 生产批次代码记录标识
+    public static final String mesBatchCodeSeqType = "BATCH_CODE";
+
+    // 生产批次代码序列数
+    private static AtomicInteger mesBatchCodeSeq = new AtomicInteger(1);
+
+    // 生产批次代码标识
+    public static final String mesBatchCodeCode = "PC";
+
+    // 条码内容记录标识
+    public static final String mesBarcodeSeqType = "BAR_CODE";
+
+    // 条码内容序列数
+    private static AtomicInteger mesBarcodeSeq = new AtomicInteger(1);
+
+    // 条码内容标识
+    public static final String mesBarcodeCode = "TM";
+
 
     /**
      * 获取通用序列号
@@ -155,6 +173,10 @@ public class Seq {
             atomicInt = dispatchCodeSeq;
         }else if (planCodeSeqType.equals(type)) {
             atomicInt = planCodeSeq;
+        }else if (mesBatchCodeSeqType.equals(type)) {
+            atomicInt = mesBatchCodeSeq;
+        }else if (mesBarcodeSeqType.equals(type)) {
+            atomicInt = mesBarcodeSeq;
         }
         return getId(atomicInt, 3, code);
     }
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java
index e5a2b6c6..e852306c 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java
@@ -1,7 +1,11 @@
 package com.hw.mes.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
+
+import com.hw.common.core.constant.MesConstants;
 import com.hw.common.core.utils.DateUtils;
+import com.hw.common.core.utils.uuid.Seq;
 import com.hw.mes.api.domain.MesBaseBarcodeInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -15,20 +19,18 @@ import com.hw.mes.service.IMesBaseBarcodeInfoService;
  * @date 2023-12-20
  */
 @Service
-public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
-{
+public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService {
     @Autowired
     private MesBaseBarcodeInfoMapper mesBaseBarcodeInfoMapper;
 
     /**
      * 查询条码信息
      *
-     * @param barcodeInfo  条码信息UID
+     * @param barcodeInfo 条码信息UID
      * @return 条码信息
      */
     @Override
-    public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeInfo(String barcodeInfo)
-    {
+    public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeInfo(String barcodeInfo) {
         return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoByBarcodeInfo(barcodeInfo);
     }
 
@@ -40,8 +42,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
      * @return 条码信息
      */
     @Override
-    public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeId(Long barcodeId)
-    {
+    public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeId(Long barcodeId) {
         return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoByBarcodeId(barcodeId);
     }
 
@@ -52,8 +53,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
      * @return 条码信息
      */
     @Override
-    public List<MesBaseBarcodeInfo> selectMesBaseBarcodeInfoList(MesBaseBarcodeInfo mesBaseBarcodeInfo)
-    {
+    public List<MesBaseBarcodeInfo> selectMesBaseBarcodeInfoList(MesBaseBarcodeInfo mesBaseBarcodeInfo) {
         return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoList(mesBaseBarcodeInfo);
     }
 
@@ -64,10 +64,26 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
      * @return 结果
      */
     @Override
-    public int insertMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo)
-    {
+    public int insertMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo) {
         mesBaseBarcodeInfo.setCreateTime(DateUtils.getNowDate());
-        return mesBaseBarcodeInfoMapper.insertMesBaseBarcodeInfo(mesBaseBarcodeInfo);
+        if (mesBaseBarcodeInfo.getBarcodeType().equals(MesConstants.MES_BARCODE_TYPE_RAW)) {
+            //同一批次的批次代码相同
+            mesBaseBarcodeInfo.setBatchCode(Seq.getId(Seq.mesBatchCodeSeqType, Seq.mesBatchCodeCode));
+            if (mesBaseBarcodeInfo.getBatchFlag().equals(MesConstants.NOT_IS_BATCH)) {
+                int frequency = mesBaseBarcodeInfo.getAmount().intValue();
+                for (int i = 0; i < frequency; i++) {
+                    // 生成数量条的不同条码内容
+                    mesBaseBarcodeInfo.setBarcodeInfo(Seq.getId(Seq.mesBarcodeSeqType, Seq.mesBarcodeCode));
+                    mesBaseBarcodeInfo.setAmount(new BigDecimal(1));
+                    mesBaseBarcodeInfoMapper.insertMesBaseBarcodeInfo(mesBaseBarcodeInfo);
+                }
+            }
+            if (mesBaseBarcodeInfo.getBatchFlag().equals(MesConstants.IS_BATCH)) {
+                mesBaseBarcodeInfo.setBarcodeInfo(Seq.getId(Seq.mesBarcodeSeqType, Seq.mesBarcodeCode));
+                mesBaseBarcodeInfoMapper.insertMesBaseBarcodeInfo(mesBaseBarcodeInfo);
+            }
+        }
+        return 1;
     }
 
     /**
@@ -77,8 +93,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
      * @return 结果
      */
     @Override
-    public int updateMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo)
-    {
+    public int updateMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo) {
         mesBaseBarcodeInfo.setUpdateTime(DateUtils.getNowDate());
         return mesBaseBarcodeInfoMapper.updateMesBaseBarcodeInfo(mesBaseBarcodeInfo);
     }
@@ -90,8 +105,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
      * @return 结果
      */
     @Override
-    public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds)
-    {
+    public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds) {
         return mesBaseBarcodeInfoMapper.deleteMesBaseBarcodeInfoByBarcodeIds(barcodeIds);
     }
 
@@ -102,8 +116,7 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService
      * @return 结果
      */
     @Override
-    public int deleteMesBaseBarcodeInfoByBarcodeId(Long barcodeId)
-    {
+    public int deleteMesBaseBarcodeInfoByBarcodeId(Long barcodeId) {
         return mesBaseBarcodeInfoMapper.deleteMesBaseBarcodeInfoByBarcodeId(barcodeId);
     }
 }
diff --git a/hw-ui/src/api/mes/barcode.js b/hw-ui/src/api/mes/barcode.js
index a3ed1980..6d990e97 100644
--- a/hw-ui/src/api/mes/barcode.js
+++ b/hw-ui/src/api/mes/barcode.js
@@ -42,3 +42,11 @@ export function delBarcode(barcodeId) {
     method: 'delete'
   })
 }
+
+// 打印条码
+export function printBarCode(barcodeId) {
+  return request({
+    url: '/mes/barcode/printBarCode/' + barcodeId,
+    method: 'get'
+  })
+}
diff --git a/hw-ui/src/views/mes/barcode/index.vue b/hw-ui/src/views/mes/barcode/index.vue
index 15ab81f5..0c862c5e 100644
--- a/hw-ui/src/views/mes/barcode/index.vue
+++ b/hw-ui/src/views/mes/barcode/index.vue
@@ -11,16 +11,16 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="条码类型" prop="barcodeType">-->
-<!--        <el-select v-model="queryParams.barcodeType" placeholder="请选择条码类型" clearable>-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.barcode_type"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="条码类型" prop="barcodeType">-->
+      <!--        <el-select v-model="queryParams.barcodeType" placeholder="请选择条码类型" clearable>-->
+      <!--          <el-option-->
+      <!--            v-for="dict in dict.type.barcode_type"-->
+      <!--            :key="dict.value"-->
+      <!--            :label="dict.label"-->
+      <!--            :value="dict.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
       <el-form-item label="采购订单号" prop="poNo">
         <el-input
           v-model="queryParams.poNo"
@@ -29,32 +29,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="生产计划编号" prop="planCode">
-        <el-input
-          v-model="queryParams.planCode"
-          placeholder="请输入生产计划编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="销售订单编号" prop="saleorderCode">
-        <el-input
-          v-model="queryParams.saleorderCode"
-          placeholder="请输入销售订单编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="绑定状态" prop="bindStatus">
-        <el-select v-model="queryParams.bindStatus" placeholder="请选择绑定状态" clearable>
-          <el-option
-            v-for="dict in dict.type.bind_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </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>
@@ -70,19 +46,21 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:barcode: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="['mes:barcode:edit']"
-        >修改</el-button>
+        >新增
+        </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="['mes:barcode:edit']"-->
+      <!--        >修改-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -92,7 +70,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:barcode:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -102,39 +81,31 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['mes:barcode:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="barcodeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="barcodeId" v-if="columns[0].visible"/>
-      <el-table-column label="打印时间" align="center" prop="printTime" width="180" v-if="columns[1].visible">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.printTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="打印人" align="center" prop="printPerson" v-if="columns[2].visible"/>
-      <el-table-column label="批次标识" align="center" prop="batchFlag" v-if="columns[3].visible" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.active_flag" :value="scope.row.batchFlag"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="条码类型" align="center" prop="barcodeType" v-if="columns[4].visible" >
+      <el-table-column label="条码类型" align="center" prop="barcodeType" v-if="columns[4].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.barcode_type" :value="scope.row.barcodeType"/>
         </template>
       </el-table-column>
-      <el-table-column label="条码内容" align="center" prop="barcodeInfo" v-if="columns[5].visible"/>
-      <el-table-column label="批次代码" align="center" prop="batchCode" v-if="columns[6].visible"/>
-      <el-table-column label="托盘RFID代码" align="center" prop="palletInfoCode" v-if="columns[7].visible"/>
-      <el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[8].visible"/>
+      <el-table-column label="采购订单号" align="center" prop="poNo" v-if="columns[13].visible" width="100"/>
+      <el-table-column label="批次代码" align="center" prop="batchCode" v-if="columns[6].visible" width="100"/>
+      <el-table-column label="条码内容" align="center" prop="barcodeInfo" v-if="columns[5].visible" width="100"/>
+      <el-table-column label="批次标识" align="center" prop="batchFlag" v-if="columns[3].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.active_flag" :value="scope.row.batchFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料名称" align="center" prop="materialId" v-if="columns[8].visible" width="100"/>
       <el-table-column label="供应商ID" align="center" prop="manufacturerId" v-if="columns[9].visible"/>
       <el-table-column label="数量" align="center" prop="amount" v-if="columns[10].visible"/>
-      <el-table-column label="打印机台名称" align="center" prop="machineName" v-if="columns[11].visible"/>
-      <el-table-column label="打印次数" align="center" prop="printNumber" v-if="columns[12].visible"/>
-      <el-table-column label="采购订单号" align="center" prop="poNo" v-if="columns[13].visible"/>
       <el-table-column label="生产日期" align="center" prop="productionDate" width="180" v-if="columns[14].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -150,6 +121,15 @@
           <span>{{ parseTime(scope.row.lastOutstockDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="托盘RFID代码" align="center" prop="palletInfoCode" v-if="columns[7].visible" width="110"/>
+      <el-table-column label="打印机台名称" align="center" prop="machineName" v-if="columns[11].visible" width="110"/>
+      <el-table-column label="打印次数" align="center" prop="printNumber" v-if="columns[12].visible"/>
+      <el-table-column label="打印人" align="center" prop="printPerson" v-if="columns[2].visible"/>
+      <el-table-column label="打印时间" align="center" prop="printTime" width="180" v-if="columns[1].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.printTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="生产计划编号" align="center" prop="planCode" v-if="columns[17].visible"/>
       <el-table-column label="生产计划明细编号" align="center" prop="planDetailCode" v-if="columns[18].visible"/>
       <el-table-column label="销售订单ID" align="center" prop="saleOrderId" v-if="columns[19].visible"/>
@@ -157,12 +137,12 @@
       <el-table-column label="项目号" align="center" prop="projectNo" v-if="columns[21].visible"/>
       <el-table-column label="流水号" align="center" prop="serialNumber" v-if="columns[22].visible"/>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[23].visible"/>
-      <el-table-column label="绑定状态" align="center" prop="bindStatus" v-if="columns[24].visible" >
+      <el-table-column label="绑定状态" align="center" prop="bindStatus" v-if="columns[24].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bind_status" :value="scope.row.bindStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="绑定托盘的人" align="center" prop="bindBy" v-if="columns[25].visible"/>
+      <el-table-column label="绑定托盘的人" align="center" prop="bindBy" v-if="columns[25].visible" width="110"/>
       <el-table-column label="绑定托盘时间" align="center" prop="bindTime" width="180" v-if="columns[26].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bindTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -174,22 +154,31 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:barcode:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:barcode:remove']"
-          >删除</el-button>
+            icon="el-icon-printer"
+            @click="handlePrintBarCode(scope.row)"
+          >打印
+          </el-button>
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            @click="handleUpdate(scope.row)"-->
+          <!--            v-hasPermi="['mes:barcode:edit']"-->
+          <!--          >修改-->
+          <!--          </el-button>-->
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-delete"-->
+          <!--            @click="handleDelete(scope.row)"-->
+          <!--            v-hasPermi="['mes:barcode:remove']"-->
+          <!--          >删除-->
+          <!--          </el-button>-->
         </template>
       </el-table-column>
     </el-table>
@@ -205,55 +194,51 @@
     <!-- 添加或修改条码信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-<!--        <el-form-item label="打印时间" prop="printTime">-->
-<!--          <el-date-picker clearable-->
-<!--                          v-model="form.printTime"-->
-<!--                          type="date"-->
-<!--                          value-format="yyyy-MM-dd"-->
-<!--                          placeholder="请选择打印时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="打印人" prop="printPerson">-->
-<!--          <el-input v-model="form.printPerson" placeholder="请输入打印人" />-->
-<!--        </el-form-item>-->
+        <el-form-item label="采购订单号" prop="poNo">
+          <el-input v-model="form.poNo" placeholder="请点击右侧检索采购订单" readonly>
+            <el-button slot="append" icon="el-icon-search" @click="handlePurchaseOrderAdd"></el-button>
+          </el-input>
+        </el-form-item>
         <el-form-item label="批次标识" prop="batchFlag">
           <el-radio-group v-model="form.batchFlag">
             <el-radio
               v-for="dict in dict.type.active_flag"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+              :disabled="batchVisible"
+            >{{ dict.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="采购订单号" prop="poNo">
-          <el-input v-model="form.poNo" placeholder="请输入采购订单号" />
+        <!--        <el-form-item label="条码类型" prop="barcodeType">-->
+        <!--          <el-radio-group v-model="form.barcodeType">-->
+        <!--            <el-radio-->
+        <!--              v-for="dict in dict.type.barcode_type"-->
+        <!--              :key="dict.value"-->
+        <!--              :label="dict.value"-->
+        <!--            >{{dict.label}}</el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="条码内容" prop="barcodeInfo">-->
+        <!--          <el-input v-model="form.barcodeInfo" placeholder="请输入条码内容" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="批次代码" prop="batchCode">-->
+        <!--          <el-input v-model="form.batchCode" placeholder="请输入批次代码" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="托盘RFID代码" prop="palletInfoCode">-->
+        <!--          <el-input v-model="form.palletInfoCode" placeholder="请输入托盘RFID代码" />-->
+        <!--        </el-form-item>-->
+        <el-form-item label="物料ID" prop="materialId" v-if="false">
+          <el-input v-model="form.materialId" placeholder="请输入物料ID"/>
         </el-form-item>
-<!--        <el-form-item label="条码类型" prop="barcodeType">-->
-<!--          <el-radio-group v-model="form.barcodeType">-->
-<!--            <el-radio-->
-<!--              v-for="dict in dict.type.barcode_type"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.value"-->
-<!--            >{{dict.label}}</el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="条码内容" prop="barcodeInfo">-->
-<!--          <el-input v-model="form.barcodeInfo" placeholder="请输入条码内容" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="批次代码" prop="batchCode">-->
-<!--          <el-input v-model="form.batchCode" placeholder="请输入批次代码" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="托盘RFID代码" prop="palletInfoCode">-->
-<!--          <el-input v-model="form.palletInfoCode" placeholder="请输入托盘RFID代码" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="物料ID" prop="materialId">
-          <el-input v-model="form.materialId" placeholder="请输入物料ID" />
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" :disabled="true"/>
         </el-form-item>
-<!--        <el-form-item label="供应商ID" prop="manufacturerId">-->
-<!--          <el-input v-model="form.manufacturerId" placeholder="请输入供应商ID" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="供应商ID" prop="manufacturerId">-->
+        <!--          <el-input v-model="form.manufacturerId" placeholder="请输入供应商ID" />-->
+        <!--        </el-form-item>-->
         <el-form-item label="数量" prop="amount">
-          <el-input-number v-model="form.amount" placeholder="请输入数量" />
+          <el-input-number v-model="form.amount" placeholder="请输入数量"/>
         </el-form-item>
 
         <el-form-item label="生产日期" prop="productionDate">
@@ -264,14 +249,14 @@
                           placeholder="请选择生产日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="接受日期" prop="acceptedDate">
-          <el-date-picker clearable
-                          v-model="form.acceptedDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择接受日期">
-          </el-date-picker>
-        </el-form-item>
+        <!--        <el-form-item label="接受日期" prop="acceptedDate">-->
+        <!--          <el-date-picker clearable-->
+        <!--                          v-model="form.acceptedDate"-->
+        <!--                          type="date"-->
+        <!--                          value-format="yyyy-MM-dd"-->
+        <!--                          placeholder="请选择接受日期">-->
+        <!--          </el-date-picker>-->
+        <!--        </el-form-item>-->
         <el-form-item label="最晚出库日期" prop="lastOutstockDate">
           <el-date-picker clearable
                           v-model="form.lastOutstockDate"
@@ -280,62 +265,59 @@
                           placeholder="请选择最晚出库日期">
           </el-date-picker>
         </el-form-item>
-<!--        <el-form-item label="生产计划编号" prop="planCode">-->
-<!--          <el-input v-model="form.planCode" placeholder="请输入生产计划编号" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="生产计划明细编号" prop="planDetailCode">-->
-<!--          <el-input v-model="form.planDetailCode" placeholder="请输入生产计划明细编号" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="销售订单ID" prop="saleOrderId">-->
-<!--          <el-input v-model="form.saleOrderId" placeholder="请输入销售订单ID" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="销售订单编号" prop="saleorderCode">-->
-<!--          <el-input v-model="form.saleorderCode" placeholder="请输入销售订单编号" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="项目号" prop="projectNo">-->
-<!--          <el-input v-model="form.projectNo" placeholder="请输入项目号" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="流水号" prop="serialNumber">-->
-<!--          <el-input v-model="form.serialNumber" placeholder="请输入流水号" />-->
-<!--        </el-form-item>-->
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
-<!--        <el-form-item label="绑定状态" prop="bindStatus">-->
-<!--          <el-radio-group v-model="form.bindStatus">-->
-<!--            <el-radio-->
-<!--              v-for="dict in dict.type.bind_status"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.value"-->
-<!--            >{{dict.label}}</el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="绑定托盘的人" prop="bindBy">-->
-<!--          <el-input v-model="form.bindBy" placeholder="请输入绑定托盘的人" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="绑定托盘时间" prop="bindTime">-->
-<!--          <el-date-picker clearable-->
-<!--                          v-model="form.bindTime"-->
-<!--                          type="date"-->
-<!--                          value-format="yyyy-MM-dd"-->
-<!--                          placeholder="请选择绑定托盘时间">-->
-<!--          </el-date-picker>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="绑定状态" prop="bindStatus">-->
+        <!--          <el-radio-group v-model="form.bindStatus">-->
+        <!--            <el-radio-->
+        <!--              v-for="dict in dict.type.bind_status"-->
+        <!--              :key="dict.value"-->
+        <!--              :label="dict.value"-->
+        <!--            >{{dict.label}}</el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="绑定托盘的人" prop="bindBy">-->
+        <!--          <el-input v-model="form.bindBy" placeholder="请输入绑定托盘的人" />-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="绑定托盘时间" prop="bindTime">-->
+        <!--          <el-date-picker clearable-->
+        <!--                          v-model="form.bindTime"-->
+        <!--                          type="date"-->
+        <!--                          value-format="yyyy-MM-dd"-->
+        <!--                          placeholder="请选择绑定托盘时间">-->
+        <!--          </el-date-picker>-->
+        <!--        </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="选择采购订单信息" :visible.sync="purchaseOrderOpen" append-to-body>
+      <add-purchaseOrder @selection="handleSelection" ref="purchaseOrderRef"></add-purchaseOrder>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitPurchaseOrderForm">确 定</el-button>
+        <el-button @click="purchaseOrderOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { listBarcode, getBarcode, delBarcode, addBarcode, updateBarcode } from "@/api/mes/barcode";
+import {listBarcode, getBarcode, delBarcode, addBarcode, updateBarcode, printBarCode} from "@/api/mes/barcode";
+import addPurchaseOrder from '@//views/mes/purchaseOrder/addPurchaseOrder.vue';
+import {getMaterialinfo} from "@//api/mes/materialinfo";
 
 export default {
   name: "Barcode",
   dicts: ['bind_status', 'active_flag', 'barcode_type'],
+  components: {
+    'add-purchaseOrder': addPurchaseOrder
+  },
   data() {
     return {
       // 遮罩层
@@ -349,10 +331,14 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      //批次显示
+      batchVisible: false,
       // 总条数
       total: 0,
       // 条码信息表格数据
       barcodeList: [],
+      // 是否显示采购订单弹出层
+      purchaseOrderOpen: false,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -393,52 +379,65 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        poNo: [
+          {required: true, message: "采购订单号不能为空", trigger: "change"}
+        ],
         batchFlag: [
-          { required: true, message: "批次标识不能为空", trigger: "change" }
+          {required: true, message: "批次标识不能为空", trigger: "change"}
         ],
         barcodeType: [
-          { required: true, message: "条码类型不能为空", trigger: "change" }
+          {required: true, message: "条码类型不能为空", trigger: "change"}
         ],
         materialId: [
-          { required: true, message: "物料ID不能为空", trigger: "blur" }
+          {required: true, message: "物料ID不能为空", trigger: "blur"}
         ],
       },
       columns: [
-        { key: 0, label: `主键标识`, visible: true },
-        { key: 1, label: `打印时间`, visible: true },
-        { key: 2, label: `打印人`, visible: true },
-        { key: 3, label: `批次标识`, visible: true },
-        { key: 4, label: `条码类型`, visible: true },
-        { key: 5, label: `条码内容`, visible: true },
-        { key: 6, label: `批次代码`, visible: true },
-        { key: 7, label: `托盘RFID代码`, visible: true },
-        { key: 8, label: `物料ID`, visible: true },
-        { key: 9, label: `供应商ID`, visible: true },
-        { key: 10, label: `数量`, visible: true },
-        { key: 11, label: `打印机台名称`, visible: true },
-        { key: 12, label: `打印次数`, visible: true },
-        { key: 13, label: `采购订单号`, visible: true },
-        { key: 14, label: `生产日期`, visible: true },
-        { key: 15, label: `接受日期`, visible: true },
-        { key: 16, label: `最晚出库日期`, visible: true },
-        { key: 17, label: `生产计划编号`, visible: true },
-        { key: 18, label: `生产计划明细编号`, visible: true },
-        { key: 19, label: `销售订单ID`, visible: true },
-        { key: 20, label: `销售订单编号`, visible: true },
-        { key: 21, label: `项目号`, visible: true },
-        { key: 22, label: `流水号`, visible: true },
-        { key: 23, label: `备注`, visible: true },
-        { key: 24, label: `绑定状态`, visible: true },
-        { key: 25, label: `绑定托盘的人`, visible: true },
-        { key: 26, label: `绑定托盘时间`, visible: true },
-        { key: 27, label: `更新人`, visible: true },
-        { key: 28, label: `更新时间`, visible: true },
+        {key: 0, label: `主键标识`, visible: false},
+        {key: 1, label: `打印时间`, visible: true},
+        {key: 2, label: `打印人`, visible: true},
+        {key: 3, label: `批次标识`, visible: true},
+        {key: 4, label: `条码类型`, visible: false},
+        {key: 5, label: `条码内容`, visible: true},
+        {key: 6, label: `批次代码`, visible: true},
+        {key: 7, label: `托盘RFID代码`, visible: true},
+        {key: 8, label: `物料名称`, visible: true},
+        {key: 9, label: `供应商ID`, visible: false},
+        {key: 10, label: `数量`, visible: true},
+        {key: 11, label: `打印机台名称`, visible: true},
+        {key: 12, label: `打印次数`, visible: true},
+        {key: 13, label: `采购订单号`, visible: true},
+        {key: 14, label: `生产日期`, visible: true},
+        {key: 15, label: `接受日期`, visible: true},
+        {key: 16, label: `最晚出库日期`, visible: true},
+        {key: 17, label: `生产计划编号`, visible: false},
+        {key: 18, label: `生产计划明细编号`, visible: false},
+        {key: 19, label: `销售订单ID`, visible: false},
+        {key: 20, label: `销售订单编号`, visible: false},
+        {key: 21, label: `项目号`, visible: false},
+        {key: 22, label: `流水号`, visible: false},
+        {key: 23, label: `备注`, visible: true},
+        {key: 24, label: `绑定状态`, visible: true},
+        {key: 25, label: `绑定托盘的人`, visible: true},
+        {key: 26, label: `绑定托盘时间`, visible: true},
+        {key: 27, label: `更新人`, visible: false},
+        {key: 28, label: `更新时间`, visible: false},
       ],
     };
   },
   created() {
     this.getList();
   },
+  // watch: {
+  //   'form.batchFlag': function (newVal, oldVal) {
+  //     // 在 form.batchFlag 变化时执行
+  //     if (newVal === '1') {
+  //       this.amountVisible = true;
+  //     } else if (newVal === '0') {
+  //       this.amountVisible = false;
+  //     }
+  //   },
+  // },
   methods: {
     /** 查询条码信息列表 */
     getList() {
@@ -503,15 +502,54 @@ export default {
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.barcodeId)
       this.barcodeInfos = selection.map(item => item.barcodeInfo)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    handleSelection(selection) {
+      this.ids = selection.map(item => item.barcodeId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增采购订单按钮操作 */
+    handlePurchaseOrderAdd() {
+      this.purchaseOrderOpen = true;
+    },
+    /** 提交采购订单按钮 */
+    submitPurchaseOrderForm() {
+      let selectedRow = this.$refs.purchaseOrderRef.selectedRow;
+      this.form.barcodeType = '1';//条码类型（1原材料,2半成品,3成品,4背板）
+      this.form.materialId = selectedRow.materialId;
+      this.form.materialName = selectedRow.materialName;
+      this.form.poNo = selectedRow.poNo;
+
+      getMaterialinfo(selectedRow.materialId).then(response => {
+        if (response.data.batchFlag != null) {
+          this.form.batchFlag = response.data.batchFlag;
+          this.batchVisible = true;
+        } else {
+          this.batchVisible = false;
+        }
+
+        this.purchaseOrderOpen = false;
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
       this.title = "添加原材料条码信息";
     },
+
+    /** 打印条码按钮操作 */
+    handlePrintBarCode(row) {
+      const barcodeId = row.barcodeId || this.ids
+      printBarCode(barcodeId).then(response => {
+
+        this.$modal.msgSuccess("打印条码成功");
+      }).catch(() => {
+
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -544,13 +582,15 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const barcodeIds = row.barcodeInfo || this.barcodeInfos;
-      this.$modal.confirm('是否确认删除原材料条码内容为"' + barcodeIds + '"的数据项？').then(function() {
+      const barcodeIds = row.barcodeId || this.ids;
+      const barcodeInfos = row.barcodeInfo || this.barcodeInfos;
+      this.$modal.confirm('是否确认删除原材料条码内容为"' + barcodeInfos + '"的数据项？').then(function () {
         return delBarcode(barcodeIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/hw-ui/src/views/mes/purchaseOrder/addPurchaseOrder.vue b/hw-ui/src/views/mes/purchaseOrder/addPurchaseOrder.vue
index f2b8654c..98292970 100644
--- a/hw-ui/src/views/mes/purchaseOrder/addPurchaseOrder.vue
+++ b/hw-ui/src/views/mes/purchaseOrder/addPurchaseOrder.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="采购订单编号" prop="poNo">
         <el-input
           v-model="queryParams.poNo"
@@ -35,22 +35,27 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="purchaseOrderList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading"
+              :data="purchaseOrderList"
+              @selection-change="handleSelectionChange"
+              @row-click="handleRowClick"
+              highlight-current-row
+    >
+      <el-table-column type="selection" width="55" align="center" v-if="false" />
       <el-table-column label="主键标识" align="center" prop="purchaseOrderId" v-if="columns[0].visible"/>
       <el-table-column label="ERP主键信息" align="center" prop="erpId" v-if="columns[1].visible"/>
       <el-table-column label="金蝶ERP订单明细ID" align="center" prop="fentryId" v-if="columns[2].visible"/>
-      <el-table-column label="采购订单编号" align="center" prop="poNo" v-if="columns[3].visible"/>
+      <el-table-column label="采购订单编号" align="center" prop="poNo" v-if="columns[3].visible"  width="120" />
+      <el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[5].visible" width="120" />
+      <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[6].visible" width="120" />
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible"/>
       <el-table-column label="单据状态" align="center" prop="documentStatus" v-if="columns[4].visible" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.document_status" :value="scope.row.documentStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="物料ID" align="center" prop="materialId" v-if="columns[5].visible"/>
-      <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[6].visible"/>
-      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible"/>
-      <el-table-column label="订单计划数量" align="center" prop="orderAmount" v-if="columns[8].visible"/>
-      <el-table-column label="完成采购数量" align="center" prop="completeAmount" v-if="columns[9].visible"/>
+      <el-table-column label="订单计划数量" align="center" prop="orderAmount" v-if="columns[8].visible" width="100"/>
+      <el-table-column label="完成采购数量" align="center" prop="completeAmount" v-if="columns[9].visible" width="100"/>
       <el-table-column label="审核日期" align="center" prop="approveDate" width="180" v-if="columns[10].visible">
         <template slot-scope="scope">
             <span>{{ parseTime(scope.row.approveDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -168,12 +173,12 @@ export default {
         ],
       },
       columns: [
-                { key: 0, label: `主键标识`, visible: true },
-                { key: 1, label: `ERP主键信息`, visible: true },
-                { key: 2, label: `金蝶ERP订单明细ID`, visible: true },
+                { key: 0, label: `主键标识`, visible: false },
+                { key: 1, label: `ERP主键信息`, visible: false },
+                { key: 2, label: `金蝶ERP订单明细ID`, visible: false },
                 { key: 3, label: `采购订单编号`, visible: true },
                 { key: 4, label: `单据状态`, visible: true },
-                { key: 5, label: `物料ID`, visible: true },
+                { key: 5, label: `物料ID`, visible: false },
                 { key: 6, label: `物料编码`, visible: true },
                 { key: 7, label: `物料名称`, visible: true },
                 { key: 8, label: `订单计划数量`, visible: true },
@@ -183,14 +188,14 @@ export default {
                 { key: 12, label: `计划交货日期`, visible: true },
                 { key: 13, label: `计划开始日期`, visible: true },
                 { key: 14, label: `计划结束日期`, visible: true },
-                { key: 15, label: `订单状态`, visible: true },
-                { key: 16, label: `完成日期`, visible: true },
-                { key: 17, label: `是否标识`, visible: true },
-                { key: 18, label: `备注`, visible: true },
-                { key: 19, label: `创建人`, visible: true },
-                { key: 20, label: `创建时间`, visible: true },
-                { key: 21, label: `更新人`, visible: true },
-                { key: 22, label: `更新时间`, visible: true },
+                { key: 15, label: `订单状态`, visible: false },
+                { key: 16, label: `完成日期`, visible: false },
+                { key: 17, label: `是否标识`, visible: false },
+                { key: 18, label: `备注`, visible: false },
+                { key: 19, label: `创建人`, visible: false },
+                { key: 20, label: `创建时间`, visible: false },
+                { key: 21, label: `更新人`, visible: false },
+                { key: 22, label: `更新时间`, visible: false },
       ],
     };
   },
@@ -251,6 +256,10 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    //选中列赋值
+    handleRowClick(row) {
+      this.selectedRow = row
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.purchaseOrderId)