From e84defb3fd6cc9222bfe7e26c9bc6f22eaeb1799 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 14 Nov 2024 09:48:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/relCode/relCode.vue | 41 +++++++++++++--------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/views/collect/relCode/relCode.vue b/src/views/collect/relCode/relCode.vue
index 708d8b4..bd78bd8 100644
--- a/src/views/collect/relCode/relCode.vue
+++ b/src/views/collect/relCode/relCode.vue
@@ -20,8 +20,8 @@
         </el-row>
         <el-row>
           <el-col :span="4">
-            <el-form-item label="产品编码:">
-              <el-input v-model="filterQuery.productCode"  placeholder="请输入产品编码" clearable></el-input>
+            <el-form-item label="产品通用名:">
+              <el-input v-model="filterQuery.cpmctymc"  placeholder="请输入产品编码" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -29,22 +29,22 @@
               <el-input v-model="filterQuery.batchNo"  placeholder="请输入批次号" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="失效日期:">
-              <el-date-picker
-                style="width: 100%"
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="4">-->
+<!--            <el-form-item label="失效日期:">-->
+<!--              <el-date-picker-->
+<!--                style="width: 100%"-->
+<!--                :picker-options="pickerOptions"-->
+<!--                v-model="actDateRange"-->
+<!--                type="daterange"-->
+<!--                format="yyyy 年 MM 月 dd 日"-->
+<!--                value-format="yyyy-MM-dd"-->
+<!--                range-separator="至"-->
+<!--                start-placeholder="开始日期"-->
+<!--                end-placeholder="结束日期"-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
       </el-form>
 
@@ -83,13 +83,12 @@
                 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
                 style="width: 100%"   row-key="id" >
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="产品编码" prop="productCode"></el-table-column>
-        <el-table-column label="追溯码" prop="curCode" width="200"></el-table-column>
-<!--        <el-table-column label="包装规格" prop="packUnit"></el-table-column>-->
+        <el-table-column label="产品通用名" prop="cpmctymc"></el-table-column>
         <el-table-column label="规格" prop="packageSpec"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="madeDate"></el-table-column>
         <el-table-column label="失效日期" prop="validateDate"></el-table-column>
+        <el-table-column label="追溯码" prop="curCode" width="200"></el-table-column>
         <el-table-column label="父级码" prop="parentCode" width="200"></el-table-column>
         <el-table-column label="二层级数量" prop="twoLevelCount"></el-table-column>
         <el-table-column label="一层级数量" prop="oneLevelCount"></el-table-column>